From b59cf8a1b4384bebc3d14fd7ce69db74b5f60e1d Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 25 May 2016 12:55:24 +0300 Subject: Android: Removed super old NDK checks Change-Id: I8c16dca1272f0413ac486fd1d54b6c678a8c9dd8 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/android-g++/qmake.conf | 8 -------- 1 file changed, 8 deletions(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index fc14eeae5a..28f5638463 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -188,14 +188,6 @@ QMAKE_LFLAGS = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH QMAKE_RPATHLINK = $$QMAKE_ANDROID_PLATFORM_LIBDIR QMAKE_LFLAGS_APP = -Wl,--no-undefined -Wl,-z,noexecstack -shared QMAKE_LFLAGS_SHLIB = -Wl,--no-undefined -Wl,-z,noexecstack -shared - -contains(NDK_ROOT, ".*r6")|contains(NDK_ROOT, ".*r5.*") { - !equals(ANDROID_PLATFORM, android-4):!equals(ANDROID_PLATFORM, android-5):!equals(ANDROID_PLATFORM, android-8) { - warning("Your NDK version is outdated. A workaround is enabled. Consider updating your NDK (workarounds are required until r6(a))") - QMAKE_LFLAGS_SHLIB += $$QMAKE_ANDROID_PLATFORM_LIBDIR/crtbegin_so.o $$QMAKE_ANDROID_PLATFORM_LIBDIR/crtend_so.o - } -} - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined QMAKE_LFLAGS_RPATH = -Wl,-rpath= -- cgit v1.2.3 From 9e9888f69aa0b78d10b16f85235918f9d41db152 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 25 May 2016 12:22:21 +0300 Subject: Initialize the value before using it. LIBGCC_PATH was used before we initialized it, somehow it magically worked ... Change-Id: I0a9a748ffbfc641f60736b0cf85d23f499b64e66 Reviewed-by: Oswald Buddenhagen --- mkspecs/android-g++/qmake.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 28f5638463..ef78c42de9 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -168,13 +168,6 @@ QMAKE_STRIP = QMAKE_RANLIB = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-ranlib -QMAKE_INCDIR = $$ANDROID_SOURCES_CXX_STL_INCDIR $$QMAKE_ANDROID_PLATFORM_INCDIR -QMAKE_LIBDIR = $$ANDROID_SOURCES_CXX_STL_LIBDIR $$QMAKE_ANDROID_PLATFORM_LIBDIR $$LIBGCC_PATH -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_OPENGL = $$QMAKE_ANDROID_PLATFORM_INCDIR -QMAKE_LIBDIR_OPENGL = $$QMAKE_ANDROID_PLATFORM_LIBDIR - equals(ANDROID_TARGET_ARCH, armeabi)|equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ LIBGCC_PATH_FULL = $$system("$$QMAKE_CC -mthumb-interwork -print-libgcc-file-name") else: \ @@ -182,6 +175,13 @@ else: \ LIBGCC_PATH = $$dirname(LIBGCC_PATH_FULL) +QMAKE_INCDIR = $$ANDROID_SOURCES_CXX_STL_INCDIR $$QMAKE_ANDROID_PLATFORM_INCDIR +QMAKE_LIBDIR = $$ANDROID_SOURCES_CXX_STL_LIBDIR $$QMAKE_ANDROID_PLATFORM_LIBDIR $$LIBGCC_PATH +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_OPENGL = $$QMAKE_ANDROID_PLATFORM_INCDIR +QMAKE_LIBDIR_OPENGL = $$QMAKE_ANDROID_PLATFORM_LIBDIR + QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LFLAGS = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH -- cgit v1.2.3