aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-07-24 17:38:32 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-24 17:38:33 -0700
commita361df7a7ab1db818781de670bb89bd35d7b5406 (patch)
tree9cd07f33436e8c203c7841cddf6c8abdf9c690de /build
parent250f36c6854d11c176a2fb75759866cd7950d2ec (diff)
parentb0d9e7168ad492e166e97b7e07ddb77c984bc696 (diff)
downloadsdk-a361df7a7ab1db818781de670bb89bd35d7b5406.zip
sdk-a361df7a7ab1db818781de670bb89bd35d7b5406.tar.gz
sdk-a361df7a7ab1db818781de670bb89bd35d7b5406.tar.bz2
Merge "Add Mips emulator support."
Diffstat (limited to 'build')
-rw-r--r--build/tools.atree1
-rwxr-xr-xbuild/tools.windows.atree2
-rw-r--r--build/windows_sdk_tools.mk1
3 files changed, 4 insertions, 0 deletions
diff --git a/build/tools.atree b/build/tools.atree
index e19c40e..370a76a 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -43,6 +43,7 @@ bin/zipalign strip tools/zipalign
bin/emulator strip tools/emulator
bin/emulator-x86 strip tools/emulator-x86
bin/emulator-arm strip tools/emulator-arm
+bin/emulator-mips strip tools/emulator-mips
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
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
index 66f375a..46206fa 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -42,9 +42,11 @@ sdk/lint/cli/etc/lint.bat tools/lint.bat
rm tools/emulator
rm tools/emulator-arm
rm tools/emulator-x86
+rm tools/emulator-mips
bin/emulator.exe strip tools/emulator.exe
bin/emulator-arm.exe strip tools/emulator-arm.exe
bin/emulator-x86.exe strip tools/emulator-x86.exe
+bin/emulator-mips.exe strip tools/emulator-mips.exe
# Emulator libraries
rm tools/lib/libOpenglRender.so
rm tools/lib/libGLES_CM_translator.so
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk
index 37a125c..ee4ca7f 100644
--- a/build/windows_sdk_tools.mk
+++ b/build/windows_sdk_tools.mk
@@ -10,6 +10,7 @@ WIN_SDK_TARGETS := \
emulator \
emulator-arm \
emulator-x86 \
+ emulator-mips \
find_java \
find_lock \
mksdcard \