diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-03-28 23:50:30 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 00:37:48 +0200 |
| commit | b8c355bad24f6b9ea8e98cb387b7b8d1a178a655 (patch) | |
| tree | 6bac20300b8622f7e0c621401d639bfe431ad8b8 /mkspecs/features/java.prf | |
| parent | ff58c27347603de1eff5651bdfa3a8f51c85291d (diff) | |
Android: Enable the java feature on Windows.
There is a bug in dx.bat in the Google Android SDK tool where
relative paths do not work correctly. We need to use our own
version of this tool until:
https://android-review.googlesource.com/#/c/52680/
..is merged.
Change-Id: I451a3239590919d014a673f3e8e17244e96676ab
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features/java.prf')
| -rw-r--r-- | mkspecs/features/java.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf index 05350db48d..029c3812e0 100644 --- a/mkspecs/features/java.prf +++ b/mkspecs/features/java.prf @@ -50,7 +50,11 @@ QMAKE_EXTENSION_SHLIB = jar # Override linker with dex (for Android) or jar (for other java builds) android { QMAKE_LINK_O_FLAG = --output= - QMAKE_LINK = $$SDK_ROOT/platform-tools/dx --dex + contains(QMAKE_HOST.os, Windows) { + QMAKE_LINK = $$PWD/data/android/dx $$SDK_ROOT --dex + } else { + QMAKE_LINK = $$SDK_ROOT/platform-tools/dx --dex + } } else { QMAKE_LINK_O_FLAG = "cf " QMAKE_LINK = jar |