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

Merge change 20833 into donut

Browse Source 
* changes:
  BUG 1993354 : Add zipalign to SDK
This commit is contained in:
Android (Google) Code Review
2009-08-11 16:18:17 -07:00
parent ca82ce16d2 f6abec3376
commit 64c277c24b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/sdk.atree
View File

@@ -31,6 +31,7 @@ bin/sqlite3 tools/sqlite3
bin/dmtracedump tools/dmtracedump bin/dmtracedump tools/dmtracedump
bin/hprof-conv tools/hprof-conv bin/hprof-conv tools/hprof-conv
bin/mksdcard tools/mksdcard bin/mksdcard tools/mksdcard
bin/zipalign tools/zipalign
# the uper-jar file that apps link against # the uper-jar file that apps link against
out/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar out/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar

11
build/tools/make_windows_sdk.sh
View File

@@ -83,7 +83,14 @@ function build() {
make -j 4 emulator || die "Build failed" make -j 4 emulator || die "Build failed"
# Disable parallel build: it generates "permission denied" issues when # Disable parallel build: it generates "permission denied" issues when
# multiple "ar.exe" are running in parallel. # multiple "ar.exe" are running in parallel.
make prebuilt adb fastboot aidl aapt dexdump dmtracedump hprof-conv mksdcard sqlite3 \ make aapt adb aidl \
prebuilt \
dexdump dmtracedump \
fastboot \
hprof-conv \
mksdcard \
sqlite3 \
zipalign \
|| die "Build failed" || die "Build failed"
} }
@@ -124,7 +131,7 @@ function package() {
TOOLS="$TEMP_SDK_DIR/tools" TOOLS="$TEMP_SDK_DIR/tools"
LIB="$TEMP_SDK_DIR/tools/lib" LIB="$TEMP_SDK_DIR/tools/lib"
rm -v "$TOOLS"/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator} rm -v "$TOOLS"/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator}
rm -v "$TOOLS"/{hierarchyviewer,hprof-conv,mksdcard,sqlite3,traceview} rm -v "$TOOLS"/{hierarchyviewer,hprof-conv,mksdcard,sqlite3,traceview,zipalign}
rm -v "$LIB"/*/swt.jar rm -v "$LIB"/*/swt.jar
rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump} rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump}