diff options
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/android-base-head.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/android-base-tail.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/common/android-base-head.conf b/mkspecs/common/android-base-head.conf index b75bcfaacb..ae4933c453 100644 --- a/mkspecs/common/android-base-head.conf +++ b/mkspecs/common/android-base-head.conf @@ -1,5 +1,8 @@ load(device_config) +# In early configure setup; nothing useful to be done here. +isEmpty(DEFAULT_ANDROID_NDK_ROOT): return() + NDK_ROOT = $$(ANDROID_NDK_ROOT) !exists($$NDK_ROOT) { NDK_ROOT = $$DEFAULT_ANDROID_NDK_ROOT diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf index 47eaa83e42..23bd6696de 100644 --- a/mkspecs/common/android-base-tail.conf +++ b/mkspecs/common/android-base-tail.conf @@ -1,3 +1,6 @@ +# In early configure setup; nothing useful to be done here. +isEmpty(DEFAULT_ANDROID_NDK_ROOT): return() + # -fstack-protector-strong offers good protection against stack smashing attacks. # It is (currently) enabled only on Android because we know for sure that Andoroid compilers supports it QMAKE_CFLAGS += -fstack-protector-strong -DANDROID |