diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 17:15:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-06 17:15:43 -0700 |
| commit | aab31e6fb54e46861eeb2e85cde9ab829c109589 (patch) | |
| tree | dba28f60b4a364e2520e605a50b7f844a843a4d4 /tools | |
| parent | d21caee7443f8f14eef5df07051f98d6d41caaf9 (diff) | |
| parent | 097ba88d5392ef4e5e104b5bcb73d511119a8fc6 (diff) | |
| download | android_development-aab31e6fb54e46861eeb2e85cde9ab829c109589.tar.gz android_development-aab31e6fb54e46861eeb2e85cde9ab829c109589.tar.bz2 android_development-aab31e6fb54e46861eeb2e85cde9ab829c109589.zip | |
am 097ba88d: Merge change 20363 into donut
Merge commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6'
* commit '097ba88d5392ef4e5e104b5bcb73d511119a8fc6':
Make android.bat copy commons-compress to tmp with the other jar files.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sdkmanager/app/etc/android.bat | 7 | ||||
| -rwxr-xr-x | tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/sdkmanager/app/etc/android.bat b/tools/sdkmanager/app/etc/android.bat index b19ce0ab0..032985de4 100755 --- a/tools/sdkmanager/app/etc/android.bat +++ b/tools/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/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index a9e8afae3..6cae085ac 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/tools/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
|