commit 80f171f82abd9589bcea5f4f1ada0aa013538c69
author Raphael Moll <ralf@android.com> Thu May 02 21:49:26 2013 -0700
committer Raphael Moll <ralf@android.com> Thu May 02 21:49:26 2013 -0700
tree 6da665e39d096ddbc2a570c9daf68838e2593e91
parent 1ea36a331bbee733a7b96f512dd79454a4a77496

SDK: disable emulator. DO NOT MERGE.

Emulator build is currently broken on mr1.1 on mac 10.8.

Change-Id: I20e536868b9269c307d3309ea9df36c7f84a1885

build/tools.atree

diff --git a/build/tools.atree b/build/tools.atree
index 78da7fc..8ed9140 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -39,17 +39,18 @@
 bin/mksdcard     strip tools/mksdcard
 bin/zipalign     strip tools/zipalign
 
-# emulator
-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
-bin/emulator64-x86                   strip tools/emulator64-x86
-bin/emulator64-arm                   strip tools/emulator64-arm
-bin/emulator64-mips                  strip tools/emulator64-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
+# Emulator disabled for mr1.1 (build currently broken on Mac 10.8)
+## emulator
+#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
+#bin/emulator64-x86                   strip tools/emulator64-x86
+#bin/emulator64-arm                   strip tools/emulator64-arm
+#bin/emulator64-mips                  strip tools/emulator64-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
 
 # OpenGLES emulation libraries
 lib/libOpenglRender${DLL_EXTENSION}         strip tools/lib/libOpenglRender${DLL_EXTENSION}