android patch
This commit is contained in:
@@ -147,7 +147,7 @@ if (POLICY CMP0053)
|
||||
cmake_policy(SET CMP0053 NEW)
|
||||
endif()
|
||||
set(__prop_names "LABEL;FULLNAME;COMPANY;ICON;INFO")
|
||||
list(APPEND __prop_names "ANDROID_TARGET_SDK;ANDROID_STORE_FILE;ANDROID_STORE_PASSWORD;ANDROID_KEY_PASSWORD;ANDROID_KEY_ALIAS")
|
||||
list(APPEND __prop_names "ANDROID_TARGET_SDK;ANDROID_STORE_FILE;ANDROID_STORE_PASSWORD;ANDROID_KEY_PASSWORD;ANDROID_KEY_ALIAS;ANDROID_NEW_LOADER")
|
||||
set(__version_names "MAJOR;MINOR;REVISION;BUILD;SUFFIX")
|
||||
include(TargetArch)
|
||||
if (NOT MY_ARCH)
|
||||
@@ -1025,6 +1025,11 @@ macro(deploy_target _T)
|
||||
if (NOT IS_ABSOLUTE "${ANDROID_STORE_FILE}")
|
||||
set(ANDROID_STORE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_STORE_FILE}")
|
||||
endif()
|
||||
if (${_T}_ANDROID_NEW_LOADER)
|
||||
set(ANDROID_NEW_LOADER "true")
|
||||
else()
|
||||
set(ANDROID_NEW_LOADER "false")
|
||||
endif()
|
||||
set(__ANDROID_DEBUG_KEYSTORE__ "${_modules_dir}/android_debug.keystore")
|
||||
set(QT_DIR ${Qt5_ROOT})
|
||||
set(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json")
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
androidBuildToolsVersion=
|
||||
androidCompileSdkVersion=@ANDROID_TARGET_SDK@
|
||||
android.bundle.enableUncompressedNativeLibs=@ANDROID_NEW_LOADER@
|
||||
buildDir=build
|
||||
qt5AndroidDir=@Qt5_ROOT@/src/android/java
|
||||
DEBUG_STORE_FILE=@__ANDROID_DEBUG_KEYSTORE__@
|
||||
|
||||
Reference in New Issue
Block a user