diff options
| -rw-r--r-- | toolchain/Android.cmake | 8 | ||||
| -rw-r--r-- | toolchain/deployment-file.json.in | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index f0d6ea71..df9d9b0e 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -251,6 +251,14 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) endif() endif() endforeach() + set(EXTRA_PREFIX_DIRS "") + foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) + if (EXTRA_PREFIX_DIRS) + set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"") + else() + set(EXTRA_PREFIX_DIRS "\"${prefix}\"") + endif() + endforeach() configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in" "${QTANDROID_EXPORTED_TARGET}-deployment.json.in") if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 64b481b0..92b1bba2 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -14,5 +14,6 @@ ##EXTRAPLUGINS## "android-package-source-directory": "@ANDROID_APK_DIR@", "stdcpp-path": "@GNUSTL_SHARED@", - "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" + "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@", + "extraPrefixDirs": [ @EXTRA_PREFIX_DIRS@ ] } |