diff options
| author | Raphael Moll <ralf@android.com> | 2014-05-06 03:56:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-05-06 03:56:50 +0000 |
| commit | 761a63621c90b38c91ce763b22ee554619c1286a (patch) | |
| tree | 50b5d1b189e04370cebad0c0a138413630989814 /build | |
| parent | 92823d279de379210294dedff674f0b27b6e2c64 (diff) | |
| parent | 8d259e998c9bb3c0b02b52b53680a0edcedc46c9 (diff) | |
| download | replicant_sdk-761a63621c90b38c91ce763b22ee554619c1286a.zip replicant_sdk-761a63621c90b38c91ce763b22ee554619c1286a.tar.gz replicant_sdk-761a63621c90b38c91ce763b22ee554619c1286a.tar.bz2 | |
Merge "Temporarily do not include emulator in win-sdk" into idea133
Auto-merge: 8d259e9
* commit '8d259e998c9bb3c0b02b52b53680a0edcedc46c9':
Temporarily do not include emulator in win-sdk
Diffstat (limited to 'build')
| -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 943869f..185f30d 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -40,25 +40,26 @@ rm tools/jobb prebuilts/devtools/tools/jobb.bat tools/jobb.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 +###RM(2014-05-05) temporarily do not include emulator in sdk +###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 |