[RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc

Bug: 19800082

  - Use librsrt_ARCH.bc for bcc-compat
  - Rename librsrt_ARCH.bc to libclcore.bc when packaging BuildTools, to
    maintain compatibility with old gradle-plugin.

Change-Id: I567935bd6ec8f6c3b91510b2a7db6d05ec895a92
This commit is contained in:
Miao Wang
2016-03-11 21:51:49 -08:00
parent f50c50b371
commit a3ec5f3444

View File

@@ -103,7 +103,7 @@ prebuilts/sdk/renderscript/lib/arm/libcompiler_rt.a build-tools/${PLATFORM_NAM
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/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/libblasV8.so
prebuilts/sdk/renderscript/lib/arm/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/armeabi-v7a/libclcore.bc
prebuilts/sdk/renderscript/lib/arm/librsrt_arm.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/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/mips/libm.so
@@ -111,7 +111,7 @@ prebuilts/sdk/renderscript/lib/mips/libcompiler_rt.a build-tools/${PLATFORM_NA
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/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/libblasV8.so
prebuilts/sdk/renderscript/lib/mips/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/mips/libclcore.bc
prebuilts/sdk/renderscript/lib/mips/librsrt_mips.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/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libm.so
@@ -119,14 +119,14 @@ prebuilts/sdk/renderscript/lib/x86/libcompiler_rt.a build-tools/${PLATFORM_NAM
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/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/x86/librsrt_x86.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86/libclcore.bc
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
prebuilts/sdk/renderscript/lib/arm64/librsrt_arm64.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/arm64-v8a/libclcore.bc
# dx
bin/dx build-tools/${PLATFORM_NAME}/dx