diff options
| author | Miao Wang <miaowang@google.com> | 2015-10-13 13:03:42 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-10-13 21:34:51 +0000 |
| commit | afe2d2420480e93f3364e0deac3082c11cceb689 (patch) | |
| tree | 5b0d733ae1e6ce6c36f0e9f601b0d79df938c727 | |
| parent | 419fb50cad5ca8cadb45c26552fd767109474315 (diff) | |
| download | android_development-afe2d2420480e93f3364e0deac3082c11cceb689.tar.gz android_development-afe2d2420480e93f3364e0deac3082c11cceb689.tar.bz2 android_development-afe2d2420480e93f3364e0deac3082c11cceb689.zip | |
Fix llvm-rs-cc.exe crash for windows
- Move the dlls needed by llvm-rs-cc to the same folder as the
executable.
Bug: 23315748
Change-Id: I2d306684fcfd1c600c1bdb6f7050d671601c6b17
| -rw-r--r-- | build/sdk-windows-x86.atree | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index cbde05748..9856f987c 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -78,19 +78,22 @@ bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdu rm build-tools/${PLATFORM_NAME}/llvm-rs-cc bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe +# libc++.so not needed on Windows. +rm build-tools/${PLATFORM_NAME}/lib/libc++.so + rm build-tools/${PLATFORM_NAME}/lib/libLLVM.so -lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/lib/libLLVM.dll +lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/libLLVM.dll rm build-tools/${PLATFORM_NAME}/lib/libclang.so -lib/libclang.dll strip build-tools/${PLATFORM_NAME}/lib/libclang.dll +lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libclang.dll #bcc not yet compiled on windows rm build-tools/${PLATFORM_NAME}/lib/libbcc.so -lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/lib/libbcc.dll +lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll rm build-tools/${PLATFORM_NAME}/lib/libbcinfo.so -lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.dll +lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll rm build-tools/${PLATFORM_NAME}/bcc_compat bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe |