diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/configure.pri b/configure.pri index 30e31ddbcd..42f3247a59 100644 --- a/configure.pri +++ b/configure.pri @@ -466,9 +466,46 @@ defineTest(qtConfOutput_prepareOptions) { "QMAKE_MAC_SDK = $$val_escape(config.input.sdk)" } android { + sdk_root = $$eval(config.input.android-sdk) + isEmpty(sdk_root): \ + sdk_root = $$getenv(ANDROID_SDK_ROOT) + isEmpty(sdk_root) { + for(ever) { + equals(QMAKE_HOST.os, Linux): \ + sdk_root = $$(HOME)/Android/Sdk + else: equals(QMAKE_HOST.os, Darwin): \ + sdk_root = $$(HOME)/Library/Android/sdk + else: \ + break() + !exists($$sdk_root): \ + sdk_root = + break() + } + } + isEmpty(sdk_root): \ + qtConfFatalError("Cannot find Android SDK." \ + "Please use -android-sdk option to specify one.") + ndk_root = $$eval(config.input.android-ndk) isEmpty(ndk_root): \ ndk_root = $$getenv(ANDROID_NDK_ROOT) + isEmpty(ndk_root) { + for(ever) { + exists($$sdk_root/ndk-bundle) { + ndk_root = $$sdk_root/ndk-bundle + break() + } + equals(QMAKE_HOST.os, Linux): \ + ndk_root = $$(HOME)/Android/Sdk/ndk-bundle + else: equals(QMAKE_HOST.os, Darwin): \ + ndk_root = $$(HOME)/Library/Android/sdk/ndk-bundle + else: \ + break() + !exists($$ndk_root): \ + ndk_root = + break() + } + } isEmpty(ndk_root): \ qtConfFatalError("Cannot find Android NDK." \ "Please use -android-ndk option to specify one.") @@ -518,13 +555,6 @@ defineTest(qtConfOutput_prepareOptions) { qtConfFatalError("Specified Android NDK host is invalid.") } - sdk_root = $$eval(config.input.android-sdk) - isEmpty(sdk_root): \ - sdk_root = $$getenv(ANDROID_SDK_ROOT) - isEmpty(sdk_root): \ - qtConfFatalError("Cannot find Android SDK." \ - "Please use -android-sdk option to specify one.") - target_arch = $$eval(config.input.android-arch) isEmpty(target_arch): \ target_arch = armeabi-v7a |