diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-06-10 00:19:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 21:39:24 +0200 |
| commit | 1bd8db01c4d3bfe19b0452a7ecf90cec9360c58b (patch) | |
| tree | 06ebac9261ab1d8cd8bf6c5362a58b752b14dadd /mkspecs/features/java.prf | |
| parent | 7971cf83528a9958bf3e6950894a06ea8706f2be (diff) | |
Android Windows: Adjust to new SDK layout
Google moved dx.bat into a new build-tools/VERSION folder
meaning our dx.bat no longer found dx.jar. Fix this by
passing into our dx.bat, the location of the real dx.bat
Removed hardcoded 17.0.0 and %ANDROID_BUILD_TOOLS_REVISION%
path searches.
Change-Id: I91c12c01745d6f12edbd126102b8f06eba291402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'mkspecs/features/java.prf')
| -rw-r--r-- | mkspecs/features/java.prf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 411a839ad8..d8ceb536a7 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -58,7 +58,13 @@ QMAKE_EXTENSION_SHLIB = jar # Override linker with dex (for distributable Android archives) or jar (for other java builds) android:!bundled_jar_file { contains(QMAKE_HOST.os, Windows) { - DEX_CMD = $$PWD/data/android/dx $$SDK_ROOT + # The location where dx.bat expects itself to be found is used as the landmark instead + # of the base sdk folder. + # Doing it this way makes this logic more similar to the other platforms and + # also means that our dx.bat is more like Google's dx.bat + DEX_BAT = $$SDK_ROOT/platform-tools/dx.bat + !exists($$DEX_BAT): DEX_BAT = $$SDK_ROOT/build-tools/$$BUILD_TOOLS_REVISION/dx.bat + DEX_CMD = $$PWD/data/android/dx $$DEX_BAT } else { DEX_CMD = $$SDK_ROOT/platform-tools/dx !exists($$DEX_CMD): DEX_CMD = $$SDK_ROOT/build-tools/$$BUILD_TOOLS_REVISION/dx |