From c3488be438a80256f0f699efd7ee796939b83c17 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 17 May 2013 22:51:08 +0100
Subject: [PATCH] Android: Remove libgnustl_shared.so copy hack.
It's not needed, and when $outpath/lib doesn't already exist
(when shadow-building for example), $outpath/lib ends up being
a copy of libgnustl_shared.so, when it really must be a folder.
Change-Id: Iaf3af6f4183090137043549cb8d9899c2bc92f24
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
configure | 4 ----
1 file changed, 4 deletions(-)
diff --git a/configure b/configure
index f13debc20dd..8427e323c65 100755
--- a/configure
+++ b/configure
@@ -2714,10 +2714,6 @@ if [ "$XPLATFORM_ANDROID" = "yes" ]; then
QT_QPA_DEFAULT_PLATFORM="android"
CFG_LARGEFILE="no"
- # FIXME: Qt Creator requires this to be in the lib/ directory of Qt. This line can be removed
- # once it's fixed to get the file directly from the NDK.
- cp -f $CFG_DEFAULT_ANDROID_NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION/libs/$CFG_DEFAULT_ANDROID_TARGET_ARCH/libgnustl_shared.so $outpath/lib
-
DeviceVar set DEFAULT_ANDROID_SDK_ROOT "$CFG_DEFAULT_ANDROID_SDK_ROOT"
DeviceVar set DEFAULT_ANDROID_NDK_ROOT "$CFG_DEFAULT_ANDROID_NDK_ROOT"
DeviceVar set DEFAULT_ANDROID_PLATFORM "$CFG_DEFAULT_ANDROID_PLATFORM"
--
GitLab