From 4d6b8c48b695b8837762c0cd69ef19e351cc9faa Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Tue, 9 Feb 2016 16:05:04 -0800 Subject: [PATCH] [RenderScript] Add arm64 prebuilts to BuildTools Bug: 27107290 - Fix arm64 RS compat mode compilation. Change-Id: I6cdcb86e412e490ca159132d41d99d0d4ae75c15 --- build/sdk-darwin-x86.atree | 1 + build/sdk-linux-x86.atree | 2 +- build/sdk-windows-x86.atree | 4 +++- build/sdk.atree | 9 ++++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 0ed8e20f1..a9d8dfc10 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -35,6 +35,7 @@ lib/libclang.dylib strip build-tools/${PLATFO lib/libc++.dylib strip build-tools/${PLATFORM_NAME}/lib/libc++.dylib prebuilts/sdk/tools/darwin/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld +prebuilts/sdk/tools/darwin/bin/aarch64-linux-android-ld strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld prebuilts/sdk/tools/darwin/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index 63dcbc35c..99eab168f 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -35,8 +35,8 @@ lib/libclang.so strip build-tools/${PLATFOR lib/libc++.so strip build-tools/${PLATFORM_NAME}/lib/libc++.so prebuilts/sdk/tools/linux/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld +prebuilts/sdk/tools/linux/bin/aarch64-linux-android-ld strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld prebuilts/sdk/tools/linux/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld prebuilts/sdk/tools/linux/bin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses - diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 9856f987c..46765f50f 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -101,6 +101,9 @@ bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_c rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld prebuilts/sdk/tools/windows/bin/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe +rm build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld +prebuilts/sdk/tools/windows/bin/aarch64-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld.exe + rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld prebuilts/sdk/tools/windows/bin/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe @@ -118,4 +121,3 @@ external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Author external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html external/sonivox/docs/JET_Creator_User_Manual_files docs/JetCreator/JET_Creator_User_Manual_files - diff --git a/build/sdk.atree b/build/sdk.atree index 6c3b324dc..a9e50fe87 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -121,9 +121,12 @@ prebuilts/sdk/renderscript/lib/x86/librsjni.so build-tools/${PLATFORM_NAM prebuilts/sdk/renderscript/lib/x86/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/libblasV8.so prebuilts/sdk/renderscript/lib/x86/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86/libclcore.bc -prebuilts/sdk/renderscript/lib/arm64/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/libRSSupport.so -prebuilts/sdk/renderscript/lib/arm64/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/librsjni.so - +prebuilts/sdk/renderscript/lib/arm64/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libc.so +prebuilts/sdk/renderscript/lib/arm64/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libm.so +prebuilts/sdk/renderscript/lib/arm64/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libcompiler_rt.a +prebuilts/sdk/renderscript/lib/arm64/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/libRSSupport.so +prebuilts/sdk/renderscript/lib/arm64/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/librsjni.so +prebuilts/sdk/renderscript/lib/arm64/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/arm64-v8a/libclcore.bc # dx bin/dx build-tools/${PLATFORM_NAME}/dx