From ebacf02e88f7ec2bf77b671d14e1d524a2786e1b Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 17 Jun 2014 21:36:30 -0700 Subject: [PATCH] Use renderscript prebuilts for windows. Change-Id: Ie487ff571a8552a166742824ba43c4c445c432f5 --- build/sdk-windows-x86.atree | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index f6df44f64..07578f170 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -62,27 +62,40 @@ dalvik/dx/etc/dx.bat build-tools/${PLATFORM_NAME}/dx.ba rm build-tools/${PLATFORM_NAME}/dexdump bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe +# delete linux rs/bcc files +rm build-tools/${PLATFORM_NAME}/llvm-rs-cc +rm build-tools/${PLATFORM_NAME}/libLLVM.so +rm build-tools/${PLATFORM_NAME}/libclang.so +rm build-tools/${PLATFORM_NAME}/libbcc.so +rm build-tools/${PLATFORM_NAME}/libbcinfo.so +rm build-tools/${PLATFORM_NAME}/bcc_compat + ###RM(2014-05-02) Temporarily disable rs/bcc for the Windows SDK as we fix cross-compilation issues -###rm build-tools/${PLATFORM_NAME}/llvm-rs-cc ###bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe ### -###rm build-tools/${PLATFORM_NAME}/libLLVM.so ###lib/libLLVM.dll strip build-tools/${PLATFORM_NAME}/libLLVM.dll ### -###rm build-tools/${PLATFORM_NAME}/libclang.so ###lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libclang.dll ### ####bcc not yet compiled on windows ### -###rm build-tools/${PLATFORM_NAME}/libbcc.so ###lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll ### -###rm build-tools/${PLATFORM_NAME}/libbcinfo.so ###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 + +###XAV(2014-06-17) Temporarily get rs/bcc from a prebuilt. +prebuilts/misc/windows/renderscript/llvm-rs-cc.exe build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe +prebuilts/misc/windows/renderscript/libLLVM.dll build-tools/${PLATFORM_NAME}/libLLVM.dll +prebuilts/misc/windows/renderscript/libclang.dll build-tools/${PLATFORM_NAME}/libclang.dll +prebuilts/misc/windows/renderscript/libbcc.dll build-tools/${PLATFORM_NAME}/libbcc.dll +prebuilts/misc/windows/renderscript/libbcinfo.dll build-tools/${PLATFORM_NAME}/libbcinfo.dll +prebuilts/misc/windows/renderscript/bcc_compat.exe build-tools/${PLATFORM_NAME}/bcc_compat.exe +### + + rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld prebuilts/sdk/tools/windows/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe