diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:40:38 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:40:38 +0100 |
| commit | 79be8352ced650e98ab0afe89e91cffee4f6a04a (patch) | |
| tree | 9dc5d3c5bb3c68c51fd218c50f3ffe0b153af2d3 /mkspecs/features/data/android | |
| parent | df63b731c920cf235cf2197e22a04597bf784d10 (diff) | |
| parent | 215f137e29ad9176fa1a5d4c446115379f5dbc0d (diff) | |
| download | qtbase-79be8352ced650e98ab0afe89e91cffee4f6a04a.tar.gz | |
Merge v5.1.0 release
Diffstat (limited to 'mkspecs/features/data/android')
| -rw-r--r-- | mkspecs/features/data/android/dx.bat | 6 |
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" + :JarFileOk set jarpath=%frameworkdir%\%jarfile% |