aboutsummaryrefslogtreecommitdiffstats
path: root/ddms/app
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-05-05 11:20:26 -0700
committerRaphael Moll <ralf@android.com>2011-05-05 11:20:26 -0700
commit9cc8ad3950427ef751e8ff6c5c8de00910f0789d (patch)
tree1ff241953ecff5742c92d3bbb937fa4c3badbe44 /ddms/app
parent38d97f3b67fc379107a423eb507b46665556731b (diff)
downloadsdk-9cc8ad3950427ef751e8ff6c5c8de00910f0789d.zip
sdk-9cc8ad3950427ef751e8ff6c5c8de00910f0789d.tar.gz
sdk-9cc8ad3950427ef751e8ff6c5c8de00910f0789d.tar.bz2
Fix launchers for SDK tools using swtmenubar.
Change-Id: Iba5860db0a56ab508d1ce155d0e079ab37eb2bc9
Diffstat (limited to 'ddms/app')
-rwxr-xr-xddms/app/etc/ddms10
-rwxr-xr-xddms/app/etc/ddms.bat2
2 files changed, 7 insertions, 5 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%