aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app/etc/android.bat
diff options
context:
space:
mode:
Diffstat (limited to 'sdkmanager/app/etc/android.bat')
-rwxr-xr-xsdkmanager/app/etc/android.bat4
1 files changed, 3 insertions, 1 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat
index bd2fdec..e82fbab 100755
--- a/sdkmanager/app/etc/android.bat
+++ b/sdkmanager/app/etc/android.bat
@@ -42,6 +42,8 @@ set jar_path=lib\sdkmanager.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
+rem Get the current content of java.ext.dirs so that we can add to it instead of replacing
+for /f %%a in ('%java_exe% -jar lib\archquery.jar java.ext.dirs') do set orig_java_ext_dirs=%%a
if "%1 %2"=="update sdk" goto StartUi
if not "%1"=="" goto EndTempCopy
@@ -76,7 +78,7 @@ if exist %swt_path% goto SetPath
goto :EOF
:SetPath
-set java_ext_dirs=%swt_path%;lib\
+set java_ext_dirs=%orig_java_ext_dirs%;%swt_path%;lib\
rem Finally exec the java program and end here.
call %java_exe% -Djava.ext.dirs=%java_ext_dirs% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir="%work_dir%" -jar %jar_path% %*