Package Renderscript files for support mode.
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 53bbc1f..9283463 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -22,10 +22,14 @@
# revision as specified in the source.properties.
-lib/libLLVM.dylib strip build-tools/${PLATFORM_NAME}/libLLVM.dylib
-lib/libbcc.dylib strip build-tools/${PLATFORM_NAME}/libbcc.dylib
-lib/libbcinfo.dylib strip build-tools/${PLATFORM_NAME}/libbcinfo.dylib
-lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/libclang.dylib
+lib/libLLVM.dylib strip build-tools/${PLATFORM_NAME}/libLLVM.dylib
+lib/libbcc.dylib strip build-tools/${PLATFORM_NAME}/libbcc.dylib
+lib/libbcinfo.dylib strip build-tools/${PLATFORM_NAME}/libbcinfo.dylib
+lib/libclang.dylib strip build-tools/${PLATFORM_NAME}/libclang.dylib
+
+prebuilts/sdk/tools/darwin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
+prebuilts/sdk/tools/darwin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
+prebuilts/sdk/tools/darwin/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
##############################################################################
# Docs Component
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 86f7754..8d9ca2b 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -22,9 +22,13 @@
# revision as specified in the source.properties.
-lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/libLLVM.so
-lib/libbcc.so strip build-tools/${PLATFORM_NAME}/libbcc.so
-lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/libbcinfo.so
-lib/libclang.so strip build-tools/${PLATFORM_NAME}/libclang.so
+lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/libLLVM.so
+lib/libbcc.so strip build-tools/${PLATFORM_NAME}/libbcc.so
+lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/libbcinfo.so
+lib/libclang.so strip build-tools/${PLATFORM_NAME}/libclang.so
+
+prebuilts/sdk/tools/linux/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
+prebuilts/sdk/tools/linux/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
+prebuilts/sdk/tools/linux/mipsel-linux-android-ld strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 97f29a2..a6beab1 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -76,6 +76,15 @@
rm build-tools/${PLATFORM_NAME}/bcc_compat
bin/bcc_compat.exe strip 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
+
+rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld
+prebuilts/sdk/tools/windows/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe
+
+rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
+prebuilts/sdk/tools/windows/mipsel-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe
+
##############################################################################
# Docs Component
diff --git a/build/sdk.atree b/build/sdk.atree
index bc87d33..088820e 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -80,7 +80,29 @@
frameworks/rs/scriptc build-tools/${PLATFORM_NAME}/renderscript/include
external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include
external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
-prebuilts/sdk/renderscript/lib build-tools/${PLATFORM_NAME}/renderscript/lib
+
+prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar
+prebuilts/sdk/renderscript/lib/arm/libclcore.bc build-tools/${PLATFORM_NAME}/renderscript/lib/libclcore.bc
+
+prebuilts/sdk/renderscript/lib/arm/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libc.so
+prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so
+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/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/librsjni.so
+
+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
+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/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/mips/librsjni.so
+
+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
+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/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/librsjni.so
+
+
# dx
bin/dx build-tools/${PLATFORM_NAME}/dx
