diff options
| author | Raphael Moll <raphael@google.com> | 2013-05-03 21:09:12 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2013-05-03 21:10:11 -0700 |
| commit | c5fd733f1d080207801ac2ab5197eb9d6b346071 (patch) | |
| tree | c58198df30c2051ef103dea5dea1dfb705833e03 | |
| parent | 80f171f82abd9589bcea5f4f1ada0aa013538c69 (diff) | |
| download | platform_sdk-jb-mr1.1-dev.tar.gz platform_sdk-jb-mr1.1-dev.tar.bz2 platform_sdk-jb-mr1.1-dev.zip | |
Fix Windows SDK: disable emulator. DO NOT MERGE.jb-mr1.1-dev
Since disabled the copy of the emulator in tools.atree, we
also need to disable the copy in the tools.windows.atree.
Change-Id: I7af970020668cd97079dae3d8dd12dd73fc0a36f
| -rwxr-xr-x | build/tools.windows.atree | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree index ea12662a5..97fad26a0 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -39,25 +39,26 @@ sdk/draw9patch/etc/draw9patch.bat tools/draw9patch.bat rm tools/lint 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 -rm tools/lib/libGLES_V2_translator.so -rm tools/lib/libEGL_translator.so -lib/libOpenglRender.dll tools/lib/libOpenglRender.dll -lib/libGLES_CM_translator.dll tools/lib/libGLES_CM_translator.dll -lib/libGLES_V2_translator.dll tools/lib/libGLES_V2_translator.dll -lib/libEGL_translator.dll tools/lib/libEGL_translator.dll -# Copy the emulator NOTICE in the tools dir -external/qemu/NOTICE tools/emulator_NOTICE.txt +# Emulator disabled for mr1.1 (build currently broken on Mac 10.8) +#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 +#rm tools/lib/libGLES_V2_translator.so +#rm tools/lib/libEGL_translator.so +#lib/libOpenglRender.dll tools/lib/libOpenglRender.dll +#lib/libGLES_CM_translator.dll tools/lib/libGLES_CM_translator.dll +#lib/libGLES_V2_translator.dll tools/lib/libGLES_V2_translator.dll +#lib/libEGL_translator.dll tools/lib/libEGL_translator.dll +## Copy the emulator NOTICE in the tools dir +#external/qemu/NOTICE tools/emulator_NOTICE.txt rm tools/etc1tool bin/etc1tool.exe strip tools/etc1tool.exe |