| Jean-Marie Henaff | c922217 | 2018-03-22 16:19:17 +0100 | [diff] [blame] | 1 | Dx version: 1.13
|
| 2 | dx.bat and dx.jar are fetched from SDK build tools 26.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.
|
| Rico Wind | 7fb994f | 2019-02-28 09:20:04 +0100 | [diff] [blame] | 7 | Also, the deprecated java.ext.dirs argument has been removed.
|
| 8 |
|
| Jean-Marie Henaff | c922217 | 2018-03-22 16:19:17 +0100 | [diff] [blame] | 9 | Diff:
|
| 10 |
|
| 11 | 26,29c26,29
|
| 12 | < set java_exe=
|
| 13 | < if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat"
|
| 14 | < if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"
|
| 15 | < if not defined java_exe goto :EOF
|
| 16 | ---
|
| 17 | > REM set java_exe=
|
| 18 | > REM if exist "%~dp0..\tools\lib\find_java.bat" call "%~dp0..\tools\lib\find_java.bat"
|
| 19 | > REM if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"
|
| 20 | > REM if not defined java_exe goto :EOF
|
| 21 | 87c87
|
| 22 | < call "%java_exe%" %javaOpts% -Djava.ext.dirs="%frameworkdir%" -jar "%jarpath%" %params%
|
| 23 | ---
|
| Rico Wind | 7fb994f | 2019-02-28 09:20:04 +0100 | [diff] [blame] | 24 | > call java %javaOpts% -jar "%jarpath%" %params%
|
| Jean-Marie Henaff | c922217 | 2018-03-22 16:19:17 +0100 | [diff] [blame] | 25 |
|
| 26 | dexmerger.bat has been copied from dx.bat, and the command line has been updated
|
| Jean-Marie Henaff | 34d85f7 | 2017-06-14 10:32:04 +0200 | [diff] [blame] | 27 | according to the SDK dexmerger bash script to call the right class. |
