diff options
Diffstat (limited to 'sdkmanager/app/etc/android')
| -rwxr-xr-x | sdkmanager/app/etc/android | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sdkmanager/app/etc/android b/sdkmanager/app/etc/android index 8feb5f2..b1dc839 100755 --- a/sdkmanager/app/etc/android +++ b/sdkmanager/app/etc/android @@ -82,6 +82,9 @@ else jarpath="$frameworkdir/$jarfile" fi +# Get the current content of java.ext.dirs so that we can add to it instead of replacing +javaExtDirs=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar" java.ext.dirs` + # Figure out the path to the swt.jar for the current architecture. # if ANDROID_SWT is defined, then just use this. # else, if running in the Android source tree, then look for the correct swt folder in prebuilt @@ -90,7 +93,7 @@ swtpath="" if [ -n "$ANDROID_SWT" ]; then swtpath="$ANDROID_SWT" else - vmarch=`${java_cmd} -jar "${frameworkdir}"/archquery.jar` + vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"` if [ -n "$ANDROID_BUILD_TOP" ]; then osname=`uname -s | tr A-Z a-z` swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt" @@ -113,5 +116,4 @@ if [ -z "$1" ]; then fi # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored -# might need more memory, e.g. -Xmx128M -exec "$java_cmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.sdkmanager.toolsdir="$progdir" -jar "$jarpath" "$@" +exec "$java_cmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="${javaExtDirs}:${frameworkdir}" -Dcom.android.sdkmanager.toolsdir="$progdir" -jar "$jarpath" "$@" |