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

AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)

Browse Source 
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
This commit is contained in:
Raphael Moll
2009-03-31 17:19:15 -07:00
committed by The Android Open Source Project
parent a0d0f0ce62
commit 3ae1236bc9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/sdk.atree
View File

@@ -24,6 +24,7 @@ bin/aidl platforms/${PLATFORM_NAME}/tools/aidl
bin/adb tools/adb bin/adb tools/adb
bin/sqlite3 tools/sqlite3 bin/sqlite3 tools/sqlite3
bin/dmtracedump tools/dmtracedump bin/dmtracedump tools/dmtracedump
bin/hprof-conv tools/hprof-conv
bin/mksdcard tools/mksdcard bin/mksdcard tools/mksdcard
# other tools # other tools

5
build/tools/make_windows_sdk.sh
View File

@@ -64,7 +64,8 @@ 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 mksdcard sqlite3 || die "Build failed" make prebuilt adb fastboot aidl aapt dexdump dmtracedump hprof-conv mksdcard sqlite3 \
|| die "Build failed"
} }
function package() { function package() {
@@ -104,7 +105,7 @@ function package() {
# Remove obsolete stuff from tools & platform # Remove obsolete stuff from tools & platform
TOOLS="$DEST/tools" TOOLS="$DEST/tools"
LIB="$DEST/tools/lib" LIB="$DEST/tools/lib"
rm -v "$TOOLS"/{adb,emulator,traceview,draw9patch,hierarchyviewer,apkbuilder,ddms,dmtracedump,mksdcard,sqlite3,android} rm -v "$TOOLS"/{adb,emulator,traceview,draw9patch,hierarchyviewer,apkbuilder,ddms,dmtracedump,hprof-conv,mksdcard,sqlite3,android}
rm -v --force "$LIB"/*.so "$LIB"/*.jnilib rm -v --force "$LIB"/*.so "$LIB"/*.jnilib
rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump} rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump}