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

am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."

Browse Source
This commit is contained in:
Raphael Moll
2010-10-26 15:42:14 -07:00
committed by Android Git Automerger
parent c07ab4bd05 4219799735
commit 07d29555ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/make_windows_sdk.sh
View File

@@ -172,7 +172,6 @@ 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)
@@ -196,6 +195,7 @@ function package() {
cp -v sdk/draw9patch/etc/draw9patch.bat "$TOOLS"/
cp -v sdk/sdkmanager/app/etc/android.bat "$TOOLS"/
cp -v sdk/monkeyrunner/etc/monkeyrunner.bat "$TOOLS"/
cp -v sdk/files/proguard/bin/*.bat "$TOOLS"/proguard/bin/
# Put the JetCreator tools, content and docs (not available in the linux SDK)
JET="$TOOLS/Jet"

2
build/tools/patch_windows_sdk.sh
View File

@@ -38,7 +38,6 @@ 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)
@@ -67,6 +66,7 @@ cp $V ${TOPDIR}sdk/layoutopt/app/etc/layoutopt.bat $TOOLS/
cp $V ${TOPDIR}sdk/draw9patch/etc/draw9patch.bat $TOOLS/
cp $V ${TOPDIR}sdk/sdkmanager/app/etc/android.bat $TOOLS/
cp $V ${TOPDIR}sdk/monkeyrunner/etc/monkeyrunner.bat $TOOLS/
cp $V ${TOPDIR}sdk/files/proguard/bin/*.bat $TOOLS/proguard/bin/
# Put the JetCreator tools, content and docs (not available in the linux SDK)
JET=$TOOLS/Jet