path: root/mkspecs
diff options
authorEskil Abrahamsen Blomfeldt <>2013-05-30 15:52:40 +0200
committerThe Qt Project <>2013-05-31 11:43:37 +0200
commit681da4feb3bdc91b84469d298a16b8b83dcffaf4 (patch)
tree1bf192ea26c904a48c60745f9c4fe6a760ccf878 /mkspecs
parent530c475d90a530fbf91b10d64f4b9978a13f389e (diff)
Android: Fix Windows build with recent SDK
Since the dx tool has moved in the SDK, we need to update our copy of it to also search in the new location for dx.jar. Task-number: QTBUG-31405 Change-Id: If093a9f51f33c5d8666919f516a3b336322a7169 Reviewed-by: Ray Donnelly <> Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Paul Olav Tvete <>
Diffstat (limited to 'mkspecs')
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/data/android/dx.bat b/mkspecs/features/data/android/dx.bat
index af143c52b5..c4ad0e3ebc 100644
--- a/mkspecs/features/data/android/dx.bat
+++ b/mkspecs/features/data/android/dx.bat
@@ -46,6 +46,12 @@ if exist "%frameworkdir%\%jarfile%" goto JarFileOk
if exist "%frameworkdir%\%jarfile%" goto JarFileOk
set "frameworkdir=%androidsdk%\framework"
+if exist "%frameworkdir%\%jarfile%" goto JarFileOk
+ set "frameworkdir=%androidsdk%\build-tools\%ANDROID_BUILD_TOOLS_REVISION%\lib"
+if exist "%frameworkdir%\%jarfile%" goto JarFileOk
+ set "frameworkdir=%androidsdk%\build-tools\17.0.0\lib"
set jarpath=%frameworkdir%\%jarfile%