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

am 097ba88d: Merge change 20363 into donut

Browse Source 
Merge commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6'

* commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6':
  Make android.bat copy commons-compress to tmp with the other jar files.
This commit is contained in:
Android (Google) Code Review
2009-08-06 17:15:43 -07:00
committed by Android Git Automerger
parent d21caee744 097ba88d53
commit aab31e6fb5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,9 +43,10 @@ if not "%1"=="" goto EndTempCopy
set tmpdir=%TEMP%\temp-android-tool set tmpdir=%TEMP%\temp-android-tool
xcopy lib\x86 %tmpdir%\lib\x86 /I /E /C /G /R /O /Y /Q > nul xcopy lib\x86 %tmpdir%\lib\x86 /I /E /C /G /R /O /Y /Q > nul
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
copy /B /D /Y lib\commons-compress* %tmpdir%\lib\ > nul
rem jarpath and swt_path are relative to PWD so we don't need to adjust them, just change dirs. rem jarpath and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
set toolsdir=%cd% set toolsdir=%cd%

2
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
View File

@@ -308,7 +308,7 @@ class UpdaterData {
// Display anything unexpected in the monitor. // Display anything unexpected in the monitor.
String msg = t.getMessage(); String msg = t.getMessage();
if (msg != null) { if (msg != null) {
monitor.setResult("Unexpected Error installing '%1%s: %2$s", monitor.setResult("Unexpected Error installing '%1$s: %2$s",
archive.getParentPackage().getShortDescription(), msg); archive.getParentPackage().getShortDescription(), msg);
} else { } else {
// no error info? get the stack call to display it // no error info? get the stack call to display it