diff options
| author | Raphael Moll <ralf@android.com> | 2012-11-28 15:48:41 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-28 15:48:41 -0800 |
| commit | c646385cf1636877e349eef27fc16eb99b318b4f (patch) | |
| tree | 094ab057de9b185469adfbd02f3f62faf00fc053 | |
| parent | b11ed0b92e25d4ea254ca817dad2724db1b6a706 (diff) | |
| parent | 1a2800ab4a1959786cf47d4e4d8f6a8315bc748f (diff) | |
| download | sdk-c646385cf1636877e349eef27fc16eb99b318b4f.zip sdk-c646385cf1636877e349eef27fc16eb99b318b4f.tar.gz sdk-c646385cf1636877e349eef27fc16eb99b318b4f.tar.bz2 | |
Merge "SDK Manager: copy guava*.jar in android.bat"
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat index 386a3e9..222ea88 100755 --- a/sdkmanager/app/etc/android.bat +++ b/sdkmanager/app/etc/android.bat @@ -48,18 +48,19 @@ for /f %%a in ('%java_exe% -jar lib\archquery.jar') do set swt_path=lib\%%a set tmp_dir=%TEMP%\temp-android-tool
xcopy %swt_path% %tmp_dir%\%swt_path% /I /E /C /G /R /Y /Q > nul
- copy /B /D /Y lib\org.eclipse.* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\sdk* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\common.jar %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\layoutlib_api.jar %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\commons-codec* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\commons-compress* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\swtmenubar.jar %tmp_dir%\lib\ > nul
copy /B /D /Y lib\commons-logging* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\commons-codec* %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\dvlib.jar %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\guava* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\httpclient* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\httpcore* %tmp_dir%\lib\ > nul
copy /B /D /Y lib\httpmime* %tmp_dir%\lib\ > nul
- copy /B /D /Y lib\dvlib.jar %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\layoutlib_api.jar %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\org.eclipse.* %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\sdk* %tmp_dir%\lib\ > nul
+ copy /B /D /Y lib\swtmenubar.jar %tmp_dir%\lib\ > nul
rem jar_path and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
set tools_dir=%cd%
|