diff options
| author | Raphael Moll <raphael@google.com> | 2013-05-02 22:14:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-02 22:14:50 +0000 |
| commit | 315197f351a4d49a64c90cf28e6c02677b37868e (patch) | |
| tree | 4982b98f100a2aed98a1e4f30eeb0253af201c5c /dx | |
| parent | 11cadca43899aa166e7d68bbaddeb2481d704454 (diff) | |
| parent | 6bff338b5318a585d7b8fa1af44b677dff056ab6 (diff) | |
| download | android_dalvik-315197f351a4d49a64c90cf28e6c02677b37868e.tar.gz android_dalvik-315197f351a4d49a64c90cf28e6c02677b37868e.tar.bz2 android_dalvik-315197f351a4d49a64c90cf28e6c02677b37868e.zip | |
Merge "Fix dx.bat to match the new SDK structure."
Diffstat (limited to 'dx')
| -rwxr-xr-x | dx/etc/dx.bat | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat index ac14fe682..6f588c44c 100755 --- a/dx/etc/dx.bat +++ b/dx/etc/dx.bat @@ -28,7 +28,8 @@ cd /d %~dp0 rem Check we have a valid Java.exe in the path.
set java_exe=
-call ..\tools\lib\find_java.bat
+if exist ..\tools\lib\find_java.bat call ..\tools\lib\find_java.bat
+if exist ..\..\tools\lib\find_java.bat call ..\..\tools\lib\find_java.bat
if not defined java_exe goto :EOF
set jarfile=dx.jar
|