diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-05-04 14:43:40 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2011-05-04 14:43:40 -0700 |
| commit | 5429213ea1c9621564692d81e585eed2ee26bc6e (patch) | |
| tree | ef0725e9111b39adbc419e51036ab1b46aad5f56 | |
| parent | b7256e47a9bc655ca9e704553cff0af45f603ca9 (diff) | |
| parent | 6d0fbdd38bf0ac0bf22c66a10139856dc9aa51b1 (diff) | |
| download | sdk-5429213ea1c9621564692d81e585eed2ee26bc6e.zip sdk-5429213ea1c9621564692d81e585eed2ee26bc6e.tar.gz sdk-5429213ea1c9621564692d81e585eed2ee26bc6e.tar.bz2 | |
merge from tools_r11
Change-Id: I10f11860b33c7f9cd9209f986d5beb9c819f6401
| -rwxr-xr-x | build/patch_windows_sdk.sh | 3 | ||||
| -rw-r--r-- | build/tools.atree | 11 | ||||
| -rw-r--r-- | build/windows_sdk_tools.mk | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh index 1ef22eb..b01e41e 100755 --- a/build/patch_windows_sdk.sh +++ b/build/patch_windows_sdk.sh @@ -22,7 +22,8 @@ TOPDIR=${TOPDIR:-$3} # Remove obsolete stuff from tools TOOLS=$TEMP_SDK_DIR/tools LIB=$TEMP_SDK_DIR/tools/lib -rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch,emulator-arm,emulator-x86} +rm $V $TOOLS/{android,apkbuilder,ddms,draw9patch} +rm $V $TOOLS/{emulator,emulator-arm,emulator-x86} rm $V $TOOLS/{hierarchyviewer,layoutopt,mksdcard,traceview,monkeyrunner} rm $V $TOOLS/proguard/bin/*.sh diff --git a/build/tools.atree b/build/tools.atree index 89481fc..2e566e6 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -40,11 +40,12 @@ bin/mksdcard tools/mksdcard bin/zipalign tools/zipalign # emulator -bin/emulator tools/emulator-arm -bin/emulator-x86 tools/emulator-x86 -sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img -usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin -usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin +bin/emulator tools/emulator +bin/emulator-x86 tools/emulator-x86 +bin/emulator-arm tools/emulator-arm +sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img +usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin +usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin # Java-Based SDK Tools bin/ddms tools/ddms diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index 8164cc5..73f4d12 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -5,6 +5,8 @@ WIN_SDK_TARGETS := \ emulator \ + emulator-arm \ + emulator-x86 \ mksdcard \ sdklauncher |