diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-06-07 13:36:51 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-06-07 14:12:18 -0700 |
| commit | 6f71099ece08673670fdc7f88b7d4959f657293b (patch) | |
| tree | 0e67f1c21e01eec8ed2ef419ed53be0ea7b71faf /sdkmanager/app/etc | |
| parent | f242f9a4dc19a004bbb05768f6e7f73726b0bca3 (diff) | |
| download | sdk-6f71099ece08673670fdc7f88b7d4959f657293b.zip sdk-6f71099ece08673670fdc7f88b7d4959f657293b.tar.gz sdk-6f71099ece08673670fdc7f88b7d4959f657293b.tar.bz2 | |
Stop using java.ext.dirs to modify classpath for android.bat
If the original value of java.ext.dirs contains space, then the
value is lost and we lose access to optional crypto packages.
The new mechanism uses a mix of -classpath (for main package
and swt whose path is computed automatically). For other
dependencies, we use the Class-Path attribute in the manifest
of sdkmanager.jar.
Change-Id: I06c46eb1abcd9b5bab6360d1430c0dcbc97f73ce
Diffstat (limited to 'sdkmanager/app/etc')
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 8 | ||||
| -rw-r--r-- | sdkmanager/app/etc/manifest.txt | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat index de8cc9a..ce97ebb 100755 --- a/sdkmanager/app/etc/android.bat +++ b/sdkmanager/app/etc/android.bat @@ -42,9 +42,6 @@ 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 :StartUi @@ -77,10 +74,7 @@ if exist %swt_path% goto SetPath echo Please set ANDROID_SWT to point to the folder containing swt.jar for your platform. goto :EOF -:SetPath -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% %* +call %java_exe% -Dcom.android.sdkmanager.toolsdir="%tools_dir%" -Dcom.android.sdkmanager.workdir="%work_dir%" -classpath "%jar_path%;%swt_path%\swt.jar" com.android.sdkmanager.Main %* rem EOF diff --git a/sdkmanager/app/etc/manifest.txt b/sdkmanager/app/etc/manifest.txt index 5676634..af31991 100644 --- a/sdkmanager/app/etc/manifest.txt +++ b/sdkmanager/app/etc/manifest.txt @@ -1 +1,2 @@ Main-Class: com.android.sdkmanager.Main +Class-Path: androidprefs.jar sdklib.jar sdkuilib.jar org.eclipse.jface_3.4.2.M20090107-0800.jar org.eclipse.equinox.common_3.4.0.v20080421-2006.jar org.eclipse.core.commands_3.4.0.I20080509-2000.jar |