Add emulator-arm to SDK, including Windows SDK.
Also fixes the fact the Windows SDK wasn't building emulator-arm
nor emulator-x86.
SDK BUG: 4377649
Change-Id: I1450a8c73e0078e69ccd28b220bf37ecd0a6fd5c
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 @@
# 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/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