summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-10-14 00:05:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-14 00:05:01 +0000
commitc0781cd7744ee4ae2a8f95c14724a9b05698174b (patch)
tree5b0d733ae1e6ce6c36f0e9f601b0d79df938c727
parentde02034f6f289945691eeec4fb89d35804198eea (diff)
parent10b385c0f863710e2d2a2ebada74a8c8c14c81f8 (diff)
downloadandroid_development-c0781cd7744ee4ae2a8f95c14724a9b05698174b.tar.gz
android_development-c0781cd7744ee4ae2a8f95c14724a9b05698174b.tar.bz2
android_development-c0781cd7744ee4ae2a8f95c14724a9b05698174b.zip
am 10b385c0: am afe2d242: Fix llvm-rs-cc.exe crash for windows
* commit '10b385c0f863710e2d2a2ebada74a8c8c14c81f8': Fix llvm-rs-cc.exe crash for windows
-rw-r--r--build/sdk-windows-x86.atree11
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