diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-08-06 17:09:11 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-08-06 17:12:09 -0700 |
| commit | 06a4ac596f8fcd072a54581fc41bcf0bd9b72829 (patch) | |
| tree | f2d1390a292bd425bfaf1a3f6b1390204cef74d4 /sdkmanager | |
| parent | 3b5831fb4cc5674c23b863d77f8ead24cd8571fe (diff) | |
| download | sdk-06a4ac596f8fcd072a54581fc41bcf0bd9b72829.zip sdk-06a4ac596f8fcd072a54581fc41bcf0bd9b72829.tar.gz sdk-06a4ac596f8fcd072a54581fc41bcf0bd9b72829.tar.bz2 | |
Make android.bat copy commons-compress to tmp with the other jar files.
BUG: 2039759
Diffstat (limited to 'sdkmanager')
| -rwxr-xr-x | sdkmanager/app/etc/android.bat | 7 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sdkmanager/app/etc/android.bat b/sdkmanager/app/etc/android.bat index b19ce0a..032985d 100755 --- a/sdkmanager/app/etc/android.bat +++ b/sdkmanager/app/etc/android.bat @@ -43,9 +43,10 @@ if not "%1"=="" goto EndTempCopy set tmpdir=%TEMP%\temp-android-tool 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\org.eclipse.* %tmpdir%\lib\ > nul - copy /B /D /Y lib\sdk* %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\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. set toolsdir=%cd% diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index a9e8afa..6cae085 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -308,7 +308,7 @@ class UpdaterData { // Display anything unexpected in the monitor.
String msg = t.getMessage();
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);
} else {
// no error info? get the stack call to display it
|