diff options
| author | Raphael Moll <ralf@android.com> | 2010-10-23 22:11:37 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2010-10-23 22:11:37 -0700 |
| commit | b04a4f947cc8ad7f5af403ab197e60e9d17a8a87 (patch) | |
| tree | acce97147a48ac68405dd2ae8a2e3881af307db0 | |
| parent | 66d61ef95f5a0f8abc8b5371409e3c5372c9e10a (diff) | |
| download | development-b04a4f947cc8ad7f5af403ab197e60e9d17a8a87.tar.gz | |
Tools package was missing proguard.bat
SDK Bug: 3126278
Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
| -rwxr-xr-x | build/tools/make_windows_sdk.sh | 2 | ||||
| -rwxr-xr-x | build/tools/patch_windows_sdk.sh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh index 396034a6d..97b3c64f9 100755 --- a/build/tools/make_windows_sdk.sh +++ b/build/tools/make_windows_sdk.sh @@ -161,6 +161,7 @@ function package() { LIB="$TEMP_SDK_DIR/tools/lib" rm -v "$TOOLS"/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool} rm -v "$TOOLS"/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign,monkeyrunner} + rm -v "$TOOLS"/proguard/bin/*.sh rm -v "$LIB"/*/swt.jar rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump} @@ -171,6 +172,7 @@ function package() { cp -v prebuilt/windows/swt/swt.jar "$LIB"/x86/ mkdir -pv "$LIB"/x86_64 cp -v prebuilt/windows-x86_64/swt/swt.jar "$LIB"/x86_64/ + cp -v external/proguard/bin/*.bat "$TOOLS"/proguard/bin/ # Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above) # and move it also in SDK/tools/lib (so that tools updates can update the root one too) diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh index 2ddb9b9b7..a6187faec 100755 --- a/build/tools/patch_windows_sdk.sh +++ b/build/tools/patch_windows_sdk.sh @@ -27,6 +27,7 @@ PLATFORM_TOOLS=$TEMP_SDK_DIR/platform-tools LIB=$TEMP_SDK_DIR/tools/lib rm $V $TOOLS/{android,apkbuilder,ddms,dmtracedump,draw9patch,emulator,etc1tool} rm $V $TOOLS/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign,monkeyrunner} +rm $V $TOOLS/proguard/bin/*.sh rm $V $LIB/*/swt.jar rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump} @@ -37,6 +38,7 @@ mkdir -pv $LIB/x86 cp $V ${TOPDIR}prebuilt/windows/swt/swt.jar $LIB/x86/ mkdir -pv $LIB/x86_64 cp $V ${TOPDIR}prebuilt/windows-x86_64/swt/swt.jar $LIB/x86_64/ +cp $V ${TOPDIR}external/proguard/bin/*.bat $TOOLS/proguard/bin/ # Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above) # and move it also in SDK/tools/lib (so that tools updates can update the root one too) |