aboutsummaryrefslogtreecommitdiffstats
path: root/hierarchyviewer
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-01-26 16:08:17 -0800
committerRaphael <raphael@google.com>2010-01-26 16:09:58 -0800
commit047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4 (patch)
tree6faf45655e9945e9bc787460e6489ee67265c5f9 /hierarchyviewer
parent60e5014c5f2783982e7afade657eaeb9a287577e (diff)
downloadsdk-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 'hierarchyviewer')
-rwxr-xr-xhierarchyviewer/etc/hierarchyviewer.bat7
1 files changed, 6 insertions, 1 deletions
diff --git a/hierarchyviewer/etc/hierarchyviewer.bat b/hierarchyviewer/etc/hierarchyviewer.bat
index 2024a79..28a4d8d 100755
--- a/hierarchyviewer/etc/hierarchyviewer.bat
+++ b/hierarchyviewer/etc/hierarchyviewer.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=hierarchyviewer.jar
set frameworkdir=
set libdir=
@@ -38,4 +43,4 @@ if exist %frameworkdir%%jarfile% goto JarFileOk
set jarpath=%frameworkdir%%jarfile%
-call java -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dhierarchyviewer.adb= -jar %jarpath% %*
+call %java_exe% -Xmx512m -Djava.ext.dirs=%frameworkdir% -Dhierarchyviewer.adb= -jar %jarpath% %*