diff options
Diffstat (limited to 'sdkmanager')
| -rwxr-xr-x | sdkmanager/app/etc/android | 9 | ||||
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 2 |
2 files changed, 8 insertions, 3 deletions
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
|