commit 92823d279de379210294dedff674f0b27b6e2c64
author Raphael Moll <ralf@android.com> Tue May 06 02:44:54 2014 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 06 02:44:54 2014 +0000
tree f9286a1f21aad84f1380ba35f6acbe04d4346159
parent 93a911709762e697be1fa0b6e6fef00ae5f36db8
parent e6241f8fc448fc563ed6bf94da09a292e5919339

Merge "Temporarily do not include emulator in sdk build." into idea133
 Auto-merge: e6241f8

* commit 'e6241f8fc448fc563ed6bf94da09a292e5919339':
  Temporarily do not include emulator in sdk build.

build/tools.atree

diff --git a/build/tools.atree b/build/tools.atree
index 3355d6d..7a992df 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -54,27 +54,28 @@
 bin/mksdcard                                  strip tools/mksdcard
 
 # 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
-sdk/emulator/skins/dynamic                          tools/lib/emulator/skins/dynamic
-
-# OpenGLES emulation libraries
-lib/libOpenglRender${DLL_EXTENSION}           strip tools/lib/libOpenglRender${DLL_EXTENSION}
-lib/libGLES_CM_translator${DLL_EXTENSION}     strip tools/lib/libGLES_CM_translator${DLL_EXTENSION}
-lib/libGLES_V2_translator${DLL_EXTENSION}     strip tools/lib/libGLES_V2_translator${DLL_EXTENSION}
-lib/libEGL_translator${DLL_EXTENSION}         strip tools/lib/libEGL_translator${DLL_EXTENSION}
-lib/lib64OpenglRender${DLL_EXTENSION}         strip tools/lib/lib64OpenglRender${DLL_EXTENSION}
-lib/lib64GLES_CM_translator${DLL_EXTENSION}   strip tools/lib/lib64GLES_CM_translator${DLL_EXTENSION}
-lib/lib64GLES_V2_translator${DLL_EXTENSION}   strip tools/lib/lib64GLES_V2_translator${DLL_EXTENSION}
-lib/lib64EGL_translator${DLL_EXTENSION}       strip tools/lib/lib64EGL_translator${DLL_EXTENSION}
+###RM(2014-05-05) temporarily do not include emulator in sdk
+###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
+###sdk/emulator/skins/dynamic                          tools/lib/emulator/skins/dynamic
+###
+#### OpenGLES emulation libraries
+###lib/libOpenglRender${DLL_EXTENSION}           strip tools/lib/libOpenglRender${DLL_EXTENSION}
+###lib/libGLES_CM_translator${DLL_EXTENSION}     strip tools/lib/libGLES_CM_translator${DLL_EXTENSION}
+###lib/libGLES_V2_translator${DLL_EXTENSION}     strip tools/lib/libGLES_V2_translator${DLL_EXTENSION}
+###lib/libEGL_translator${DLL_EXTENSION}         strip tools/lib/libEGL_translator${DLL_EXTENSION}
+###lib/lib64OpenglRender${DLL_EXTENSION}         strip tools/lib/lib64OpenglRender${DLL_EXTENSION}
+###lib/lib64GLES_CM_translator${DLL_EXTENSION}   strip tools/lib/lib64GLES_CM_translator${DLL_EXTENSION}
+###lib/lib64GLES_V2_translator${DLL_EXTENSION}   strip tools/lib/lib64GLES_V2_translator${DLL_EXTENSION}
+###lib/lib64EGL_translator${DLL_EXTENSION}       strip tools/lib/lib64EGL_translator${DLL_EXTENSION}
 
 
 # sdk.git Ant and gradle templates for project build files