Fix launchers for SDK tools using swtmenubar.

Change-Id: Iba5860db0a56ab508d1ce155d0e079ab37eb2bc9

6 files changed, 22 insertions, 11 deletions

diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms
index 10b3a56..b0e529b 100755
--- a/ddms/app/etc/ddms
+++ b/ddms/app/etc/ddms
@@ -75,7 +75,7 @@ if [ `uname` = "Linux" ]; then
     export GDK_NATIVE_WINDOWS=true
 fi
 
-jarpath="$frameworkdir/$jarfile"
+jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar"
 
 # Figure out the path to the swt.jar for the current architecture.
 # if ANDROID_SWT is defined, then just use this.
@@ -100,6 +100,8 @@ if [ ! -d "$swtpath" ]; then
     exit 1
 fi
 
-# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
-# might need more memory, e.g. -Xmx128M
-exec "$javaCmd" -Xmx256M $os_opts $java_debug -Dcom.android.ddms.bindir="$progdir" -classpath "$jarpath:$swtpath/swt.jar" com.android.ddms.Main "$@"
+exec "$javaCmd" \
+    -Xmx256M $os_opts $java_debug \
+    -Dcom.android.ddms.bindir="$progdir" \
+    -classpath "$jarpath:$swtpath/swt.jar" \
+    com.android.ddms.Main "$@"
diff --git a/ddms/app/etc/ddms.bat b/ddms/app/etc/ddms.bat
index 0b02cb3..4b0675d 100755
--- a/ddms/app/etc/ddms.bat
+++ b/ddms/app/etc/ddms.bat
@@ -48,7 +48,7 @@ if debug NEQ "%1" goto NoDebug
     shift 1

 :NoDebug

 

-set jarpath=%frameworkdir%%jarfile%

+set jarpath=%frameworkdir%%jarfile%;%frameworkdir%swtmenubar.jar

 

 if not defined ANDROID_SWT goto QueryArch

     set swt_path=%ANDROID_SWT%

diff --git a/hierarchyviewer2/app/etc/hierarchyviewer b/hierarchyviewer2/app/etc/hierarchyviewer
index 9f31701..82304dc 100755
--- a/hierarchyviewer2/app/etc/hierarchyviewer
+++ b/hierarchyviewer2/app/etc/hierarchyviewer
@@ -76,7 +76,7 @@ if [ `uname` = "Linux" ]; then
     export GDK_NATIVE_WINDOWS=true
 fi
 
-jarpath="$frameworkdir/$jarfile"
+jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar"
 
 # Figure out the path to the swt.jar for the current architecture.
 # if ANDROID_SWT is defined, then just use this.
@@ -103,4 +103,8 @@ fi
 
 # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
 # might need more memory, e.g. -Xmx128M
-exec "$javaCmd" -Xmx512M $os_opts $java_debug -Dcom.android.hierarchyviewer.bindir="$progdir" -classpath "$jarpath:$swtpath/swt.jar" com.android.hierarchyviewer.HierarchyViewerApplication "$@"
+exec "$javaCmd" \
+    -Xmx512M $os_opts $java_debug \
+    -Dcom.android.hierarchyviewer.bindir="$progdir" \
+    -classpath "$jarpath:$swtpath/swt.jar" \
+    com.android.hierarchyviewer.HierarchyViewerApplication "$@"
diff --git a/hierarchyviewer2/app/etc/hierarchyviewer.bat b/hierarchyviewer2/app/etc/hierarchyviewer.bat
index 0876d2f..8a14957 100755
--- a/hierarchyviewer2/app/etc/hierarchyviewer.bat
+++ b/hierarchyviewer2/app/etc/hierarchyviewer.bat
@@ -49,7 +49,7 @@ if debug NEQ "%1" goto NoDebug
     shift 1

 :NoDebug

 

-set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar

+set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar;%frameworkdir%swtmenubar.jar

 

 if not defined ANDROID_SWT goto QueryArch

     set swt_path=%ANDROID_SWT%

diff --git a/sdkmanager/app/etc/android b/sdkmanager/app/etc/android
index 57ce733..555e071 100755
--- a/sdkmanager/app/etc/android
+++ b/sdkmanager/app/etc/android
@@ -74,9 +74,10 @@ fi
 
 if [ "$OSTYPE" = "cygwin" ] ; then
     jarpath=`cygpath -w  "$frameworkdir/$jarfile"`
+    jarpath="$jarpath;"`cygpath -w  "$frameworkdir/swtmenubar.jar"`
     progdir=`cygpath -w  "$progdir"`
 else
-    jarpath="$frameworkdir/$jarfile"
+    jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar"
 fi
 
 # Get the current content of java.ext.dirs so that we can add to it instead of replacing
@@ -106,4 +107,8 @@ if [ ! -d "$swtpath" ]; then
 fi
 
 # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
-exec "$java_cmd" -Xmx256M $os_opts $java_debug -Dcom.android.sdkmanager.toolsdir="$progdir" -classpath "$jarpath:$swtpath/swt.jar" com.android.sdkmanager.Main "$@"
+exec "$java_cmd" \
+    -Xmx256M $os_opts $java_debug \
+    -Dcom.android.sdkmanager.toolsdir="$progdir" \
+    -classpath "$jarpath:$swtpath/swt.jar" \
+    com.android.sdkmanager.Main "$@"
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index d4b5939..0d83734 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -37,7 +37,7 @@ set java_exe=
 call lib\find_java.bat

 if not defined java_exe goto :EOF

 

-set jar_path=lib\sdkmanager.jar

+set jar_path=lib\sdkmanager.jar;lib\swtmenubar.jar

 

 rem Set SWT.Jar path based on current architecture (x86 or x86_64)

 for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a