AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: clean configure params for android

Browse Source 
-android-toolchain-version is not needed anymore as we are using exclusively the llvm toolchain.

Change-Id: Ia033297a6a2c968352c364758eb1436380a5f96e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
BogDan Vatra 2019-08-28 08:31:00 +03:00
parent fc49d73c44
commit 65dfc485ad
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_help.txt
View File

@ -205,7 +205,6 @@ Build environment:
[$ANDROID_NDK_HOST] [$ANDROID_NDK_HOST]
-android-abis ....... Comma separated Android abis, default is: -android-abis ....... Comma separated Android abis, default is:
armeabi-v7a,arm64-v8a,x86,x86_64 armeabi-v7a,arm64-v8a,x86,x86_64
-android-toolchain-version ... Set Android toolchain version
-android-style-assets Automatically extract style assets from the device at -android-style-assets Automatically extract style assets from the device at
run time. This option makes the Android style behave run time. This option makes the Android style behave
correctly, but also makes the Android platform plugin correctly, but also makes the Android platform plugin

1
configure.json
View File

@ -56,7 +56,6 @@
"android-ndk-host": "string", "android-ndk-host": "string",
"android-ndk-platform": "string", "android-ndk-platform": "string",
"android-sdk": "string", "android-sdk": "string",
"android-toolchain-version": "string",
"android-style-assets": "boolean", "android-style-assets": "boolean",
"appstore-compliant": "boolean", "appstore-compliant": "boolean",

12
configure.pri
View File

@ -573,14 +573,7 @@ defineTest(qtConfOutput_prepareOptions) {
qtConfFatalError("Cannot find Android NDK." \ qtConfFatalError("Cannot find Android NDK." \
"Please use -android-ndk option to specify one.") "Please use -android-ndk option to specify one.")
ndk_tc_ver = $$eval(config.input.android-toolchain-version) ndk_tc_pfx = $$ndk_root/toolchains/llvm/prebuilt
isEmpty(ndk_tc_ver): \
ndk_tc_ver = 4.9
!exists($$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt/*): \
qtConfFatalError("Cannot detect Android NDK toolchain." \
"Please use -android-toolchain-version to specify it.")
ndk_tc_pfx = $$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt
ndk_host = $$eval(config.input.android-ndk-host) ndk_host = $$eval(config.input.android-ndk-host)
isEmpty(ndk_host): \ isEmpty(ndk_host): \
ndk_host = $$getenv(ANDROID_NDK_HOST) ndk_host = $$getenv(ANDROID_NDK_HOST)
@ -632,8 +625,7 @@ defineTest(qtConfOutput_prepareOptions) {
"DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \ "DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \
"DEFAULT_ANDROID_PLATFORM = $$platform" \ "DEFAULT_ANDROID_PLATFORM = $$platform" \
"DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \ "DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \
"DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')" \ "DEFAULT_ANDROID_ABIS = $$split(android_abis, ',')"
"DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION = $$ndk_tc_ver"
} }
export($${currentConfig}.output.devicePro) export($${currentConfig}.output.devicePro)

1
mkspecs/features/android/android_deployment_settings.prf
View File

@ -71,4 +71,3 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded {
write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT)|error() write_file($$ANDROID_DEPLOYMENT_SETTINGS_FILE, FILE_CONTENT)|error()
} }