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.
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 "$@"
shift 1\r
:NoDebug\r
\r
-set jarpath=%frameworkdir%%jarfile%\r
+set jarpath=%frameworkdir%%jarfile%;%frameworkdir%swtmenubar.jar\r
\r
if not defined ANDROID_SWT goto QueryArch\r
set swt_path=%ANDROID_SWT%\r
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.
# 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 "$@"
shift 1\r
:NoDebug\r
\r
-set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar\r
+set jarpath=%frameworkdir%%jarfile%;%frameworkdir%hierarchyviewerlib.jar;%frameworkdir%swtmenubar.jar\r
\r
if not defined ANDROID_SWT goto QueryArch\r
set swt_path=%ANDROID_SWT%\r
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
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 "$@"
call lib\find_java.bat\r
if not defined java_exe goto :EOF\r
\r
-set jar_path=lib\sdkmanager.jar\r
+set jar_path=lib\sdkmanager.jar;lib\swtmenubar.jar\r
\r
rem Set SWT.Jar path based on current architecture (x86 or x86_64)\r
for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a\r