AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225
Automated import of CL 143876
diff --git a/build/sdk.atree b/build/sdk.atree
index 0f62ea0..438ab77 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -24,6 +24,7 @@
bin/adb tools/adb
bin/sqlite3 tools/sqlite3
bin/dmtracedump tools/dmtracedump
+bin/hprof-conv tools/hprof-conv
bin/mksdcard tools/mksdcard
# other tools
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh
index dedf3a7..2abe7b1 100755
--- a/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@ -64,7 +64,8 @@
make -j 4 emulator || die "Build failed"
# Disable parallel build: it generates "permission denied" issues when
# 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() {
@@ -104,7 +105,7 @@
# Remove obsolete stuff from tools & platform
TOOLS="$DEST/tools"
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 "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump}