From afe2d2420480e93f3364e0deac3082c11cceb689 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Tue, 13 Oct 2015 13:03:42 -0700 Subject: [PATCH] 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 --- build/sdk-windows-x86.atree | 11 +++++++---- 1 file 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