am d921b5cc: am 2306687c: Merge "[RenderScript] update sdk.atree to include libblas.so" into mnc-dev

* commit 'd921b5cc0afffe33b06b6c09b29bc9c8ff6bb976':
  [RenderScript] update sdk.atree to include libblas.so
This commit is contained in:
Miao Wang
2015-06-18 04:08:33 +00:00
committed by Android Git Automerger

View File

@@ -98,6 +98,7 @@ prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAM
prebuilts/sdk/renderscript/lib/arm/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a prebuilts/sdk/renderscript/lib/arm/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/arm/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so prebuilts/sdk/renderscript/lib/arm/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
prebuilts/sdk/renderscript/lib/arm/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/librsjni.so prebuilts/sdk/renderscript/lib/arm/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/librsjni.so
prebuilts/sdk/renderscript/lib/arm/libblas.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/libblas.so
prebuilts/sdk/renderscript/lib/arm/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/armeabi-v7a/libclcore.bc prebuilts/sdk/renderscript/lib/arm/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/armeabi-v7a/libclcore.bc
prebuilts/sdk/renderscript/lib/mips/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/mips/libc.so prebuilts/sdk/renderscript/lib/mips/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/mips/libc.so
@@ -105,6 +106,7 @@ prebuilts/sdk/renderscript/lib/mips/libm.so build-tools/${PLATFORM_NA
prebuilts/sdk/renderscript/lib/mips/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/mips/libcompiler_rt.a prebuilts/sdk/renderscript/lib/mips/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/mips/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/mips/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/libRSSupport.so prebuilts/sdk/renderscript/lib/mips/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/libRSSupport.so
prebuilts/sdk/renderscript/lib/mips/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/librsjni.so prebuilts/sdk/renderscript/lib/mips/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/librsjni.so
prebuilts/sdk/renderscript/lib/mips/libblas.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/libblas.so
prebuilts/sdk/renderscript/lib/mips/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/mips/libclcore.bc prebuilts/sdk/renderscript/lib/mips/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/mips/libclcore.bc
prebuilts/sdk/renderscript/lib/x86/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libc.so prebuilts/sdk/renderscript/lib/x86/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libc.so
@@ -112,10 +114,10 @@ prebuilts/sdk/renderscript/lib/x86/libm.so build-tools/${PLATFORM_NAM
prebuilts/sdk/renderscript/lib/x86/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libcompiler_rt.a prebuilts/sdk/renderscript/lib/x86/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/x86/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/libRSSupport.so prebuilts/sdk/renderscript/lib/x86/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/libRSSupport.so
prebuilts/sdk/renderscript/lib/x86/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/librsjni.so prebuilts/sdk/renderscript/lib/x86/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/librsjni.so
prebuilts/sdk/renderscript/lib/x86/libblas.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/libblas.so
prebuilts/sdk/renderscript/lib/x86/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86/libclcore.bc prebuilts/sdk/renderscript/lib/x86/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86/libclcore.bc
# dx # dx
bin/dx build-tools/${PLATFORM_NAME}/dx bin/dx build-tools/${PLATFORM_NAME}/dx
framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar framework/dx.jar build-tools/${PLATFORM_NAME}/lib/dx.jar