1 Dx version: 1.12 2 dx.bat and dx.jar are fetched from SDK build tools 24.0.0. 3 dx.bat has been modified so that the code that checks if 'java' if on current path 4 is removed and replaced by a direct reference to it. 5 This is done because this relies on a tool found in the SDK and not present in the 6 current package. 7 Diff: 8 9 26,29c26,29 10 < set java_exe= 11 < if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat" 12 < if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat" 13 < if not defined java_exe goto :EOF 14 --- 15 > REM set java_exe= 16 > REM if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat" 17 > REM if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat" 18 > REM if not defined java_exe goto :EOF 19 87c87 20 < call "%java_exe%" %javaOpts% -Djava.ext.dirs="%frameworkdir%" -jar "%jarpath%" %params% 21 --- 22 > call java %javaOpts% -Djava.ext.dirs="%frameworkdir%" -jar "%jarpath%" %params% 23 24 dexmerger.bat has been copied from dx.bat, and the command line has been updated 25 according to the SDK dexmerger bash script to call the right class.
