LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am fa9cd9a6: SDK Updater: fix android.bat for Windows to change dirs to the temp dir. This removes a locked handle to the SDK/tools and allows the update to update its own tools folder.

Browse Source 
Merge commit 'fa9cd9a69431cb3a6e1be4092ee498a56714e093'

* commit 'fa9cd9a69431cb3a6e1be4092ee498a56714e093':
  SDK Updater: fix android.bat for Windows to change dirs to the
This commit is contained in:
Raphael
2009-07-06 11:17:26 -07:00
committed by The Android Open Source Project
parent 0865112996 fa9cd9a694
commit 6cae31d457
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/sdkmanager/app/etc/android.bat
View File

@@ -36,8 +36,8 @@ if not "%1"=="" goto EndTempCopy
echo Starting Android SDK Updater echo Starting Android SDK Updater
rem We're now going to create a temp dir to hold all the Jar files needed rem We're now going to create a temp dir to hold all the Jar files needed
rem to run the android tool, copy them in the temp dir and finally adjust rem to run the android tool, copy them in the temp dir and finally execute
rem the paths accordingly. We do this only when the launcher is run without rem from that path. We do this only when the launcher is run without
rem arguments, to display the SDK Updater UI. This allows the updater to rem arguments, to display the SDK Updater UI. This allows the updater to
rem update the tools directory where the updater itself is located. rem update the tools directory where the updater itself is located.
@@ -46,8 +46,10 @@ if not "%1"=="" goto EndTempCopy
copy /B /D /Y lib\androidprefs.jar %tmpdir%\lib\ > nul copy /B /D /Y lib\androidprefs.jar %tmpdir%\lib\ > nul
copy /B /D /Y lib\org.eclipse.* %tmpdir%\lib\ > nul copy /B /D /Y lib\org.eclipse.* %tmpdir%\lib\ > nul
copy /B /D /Y lib\sdk* %tmpdir%\lib\ > nul copy /B /D /Y lib\sdk* %tmpdir%\lib\ > nul
set jarpath=%tmpdir%\%jarpath%
set swt_path=%tmpdir%\%swt_path% rem jarpath and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
set toolsdir=%cd%
cd %tmpdir%
:EndTempCopy :EndTempCopy
@@ -62,4 +64,4 @@ if exist %swt_path% goto SetPath
:SetPath :SetPath
set javaextdirs=%swt_path%;lib\ set javaextdirs=%swt_path%;lib\
call java -Djava.ext.dirs=%javaextdirs% -Dcom.android.sdkmanager.toolsdir= -Dcom.android.sdkmanager.workdir="%workdir%" -jar %jarpath% %* call java -Djava.ext.dirs=%javaextdirs% -Dcom.android.sdkmanager.toolsdir="%toolsdir%" -Dcom.android.sdkmanager.workdir="%workdir%" -jar %jarpath% %*