diff options
| author | Raphael Moll <raphael@google.com> | 2010-01-26 16:22:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-26 16:22:33 -0800 |
| commit | 912fa77151c7814b58c9b6ab46a2f682cd97fcd6 (patch) | |
| tree | 556c9e25c5615af827d8350118c4146cffa2f645 /traceview | |
| parent | aae21fc056ff15325c5ff5158648b7c6be7728de (diff) | |
| parent | 047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4 (diff) | |
| download | sdk-912fa77151c7814b58c9b6ab46a2f682cd97fcd6.zip sdk-912fa77151c7814b58c9b6ab46a2f682cd97fcd6.tar.gz sdk-912fa77151c7814b58c9b6ab46a2f682cd97fcd6.tar.bz2 | |
Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair
Diffstat (limited to 'traceview')
| -rwxr-xr-x | traceview/etc/traceview.bat | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/traceview/etc/traceview.bat b/traceview/etc/traceview.bat index 02fbe85..15530a9 100755 --- a/traceview/etc/traceview.bat +++ b/traceview/etc/traceview.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=traceview.jar set frameworkdir= @@ -43,7 +48,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 @@ -55,4 +60,4 @@ if exist %swt_path% goto SetPath :SetPath set javaextdirs=%swt_path%;%frameworkdir% -call java -Djava.ext.dirs=%javaextdirs% -Dcom.android.traceview.toolsdir= -jar %jarpath% %* +call %java_exe% -Djava.ext.dirs=%javaextdirs% -Dcom.android.traceview.toolsdir= -jar %jarpath% %* |