diff options
| author | Aleix Pol <aleixpol@kde.org> | 2015-10-01 01:25:03 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2015-10-01 01:25:03 +0200 |
| commit | 3b20ef911eb83b7bd37315ace682e0e6bc6195d9 (patch) | |
| tree | 610f42d8ea9a803b4b905e2fd4dea65764829d46 /toolchain/deployment-file.json.in | |
| parent | 1c20edb86115ecf788f64cb8563b85129c7a669d (diff) | |
| download | extra-cmake-modules-3b20ef911eb83b7bd37315ace682e0e6bc6195d9.tar.gz extra-cmake-modules-3b20ef911eb83b7bd37315ace682e0e6bc6195d9.tar.bz2 | |
Remove workaround to delay execution on Android
* Remove get_property calls on targets, this way we don't need to be called
right before configuration time.
* Removes EOFHook
Instead we process it at generation time using the link.txt file (which is
probably another hack)
REVIEW: 125084
Diffstat (limited to 'toolchain/deployment-file.json.in')
| -rw-r--r-- | toolchain/deployment-file.json.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 8534cd2f..9367bc1b 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -8,7 +8,7 @@ "ndk-host": "@_HOST@", "target-architecture": "@ANDROID_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", - "android-extra-libs": "@_DEPS@", + "android-extra-libs": "##EXTRALIBS##", "android-extra-plugins": "@CMAKE_INSTALL_PREFIX@/share,@CMAKE_INSTALL_PREFIX@/lib/qml", "android-package-source-directory": "@ANDROID_APK_DIR@", "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@" |