diff options
| author | Raphael <raphael@google.com> | 2010-01-26 16:08:17 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-01-26 16:09:58 -0800 |
| commit | 047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4 (patch) | |
| tree | 6faf45655e9945e9bc787460e6489ee67265c5f9 /ddms | |
| parent | 60e5014c5f2783982e7afade657eaeb9a287577e (diff) | |
| download | sdk-047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4.zip sdk-047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4.tar.gz sdk-047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4.tar.bz2 | |
Windows SDK: use find_java.bat in all batch wrappers.
SDK Bug: 2315813
Change-Id: If026d09f927b3d0b5707dfd08e1367e4ba2da28b
Diffstat (limited to 'ddms')
| -rwxr-xr-x | ddms/app/etc/ddms.bat | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ddms/app/etc/ddms.bat b/ddms/app/etc/ddms.bat index ffe536d..c98621b 100755 --- a/ddms/app/etc/ddms.bat +++ b/ddms/app/etc/ddms.bat @@ -24,6 +24,11 @@ rem Change current directory and drive to where the script is, to avoid rem issues with directories containing whitespaces. cd /d %~dp0 +rem Check we have a valid Java.exe in the path. +set java_exe= +call find_java.bat +if not defined java_exe goto :EOF + set jarfile=ddms.jar set frameworkdir= @@ -48,7 +53,7 @@ if not defined ANDROID_SWT goto QueryArch :QueryArch - for /f %%a in ('java -jar %frameworkdir%archquery.jar') do set swt_path=%frameworkdir%%%a + for /f %%a in ('%java_exe% -jar %frameworkdir%archquery.jar') do set swt_path=%frameworkdir%%%a :SwtDone @@ -60,5 +65,5 @@ if exist %swt_path% goto SetPath :SetPath set javaextdirs=%swt_path%;%frameworkdir% -call java %java_debug% -Djava.ext.dirs=%javaextdirs% -Dcom.android.ddms.bindir= -jar %jarpath% %* +call %java_exe% %java_debug% -Djava.ext.dirs=%javaextdirs% -Dcom.android.ddms.bindir= -jar %jarpath% %* |