diff options
| author | Raphael Moll <raphael@google.com> | 2013-04-24 15:02:13 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-04-24 15:28:12 -0700 |
| commit | 6bff338b5318a585d7b8fa1af44b677dff056ab6 (patch) | |
| tree | 3b2d6c02b3459f52a14d50022e56e078bf27fe1f /dx | |
| parent | e5edfce17359c0353744dd2b4db3a8deef2aef09 (diff) | |
| download | android_dalvik-6bff338b5318a585d7b8fa1af44b677dff056ab6.tar.gz android_dalvik-6bff338b5318a585d7b8fa1af44b677dff056ab6.tar.bz2 android_dalvik-6bff338b5318a585d7b8fa1af44b677dff056ab6.zip | |
Fix dx.bat to match the new SDK structure.
(Cherry-picked from c26c1291743ce7877cf11f3dc73d6f0c240229f7)
Change-Id: I57a7678178fc58e2a101c9d86da5009c6ec4f6a0
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
|