From afda1d33deb01d79d1072bfa3156236fc452600c Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 25 Jul 2013 10:40:54 -0700
Subject: Add dynamic libraries for renderscript.

The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.

Also add the new support stuff.

Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
---
 build/sdk-darwin-x86.atree  | 13 +++++++++++++
 build/sdk-linux-x86.atree   | 13 +++++++++++++
 build/sdk-windows-x86.atree |  9 +++++++++
 build/sdk.atree             |  3 +++
 4 files changed, 38 insertions(+)

(limited to 'build')

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 118ed1c50..11d4a19f1 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -14,6 +14,19 @@
 # limitations under the License.
 #
 
+##############################################################################
+# Build Tools Component
+##############################################################################
+# Note that the build-tools sub-folder uses the platform-name as a placeholder
+# at build-time. Packaging will later change that to the actual build-tools
+# revision as specified in the source.properties.
+
+
+lib/libLLVM.dylib                 build-tools/${PLATFORM_NAME}/libLLVM.dylib
+lib/libbcc.dylib                  build-tools/${PLATFORM_NAME}/libbcc.dylib
+lib/libbcinfo.dylib               build-tools/${PLATFORM_NAME}/libbcinfo.dylib
+lib/libclang.dylib                build-tools/${PLATFORM_NAME}/libclang.dylib
+
 ##############################################################################
 # Docs Component
 ##############################################################################
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index e21785e4b..7b1f6dd17 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -14,4 +14,17 @@
 # limitations under the License.
 #
 
+##############################################################################
+# Build Tools Component
+##############################################################################
+# Note that the build-tools sub-folder uses the platform-name as a placeholder
+# at build-time. Packaging will later change that to the actual build-tools
+# revision as specified in the source.properties.
+
+
+lib/libLLVM.so                 build-tools/${PLATFORM_NAME}/libLLVM.so
+lib/libbcc.so                  build-tools/${PLATFORM_NAME}/libbcc.so
+lib/libbcinfo.so               build-tools/${PLATFORM_NAME}/libbcinfo.so
+lib/libclang.so                build-tools/${PLATFORM_NAME}/libclang.so
+
 
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index c9ec5f97a..c8be434b5 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -41,6 +41,9 @@ bin/AdbWinApi.dll                             platform-tools/AdbWinApi.dll
 ##############################################################################
 # Build Tools Component
 ##############################################################################
+# Note that the build-tools sub-folder uses the platform-name as a placeholder
+# at build-time. Packaging will later change that to the actual build-tools
+# revision as specified in the source.properties.
 
 rm build-tools/${PLATFORM_NAME}/aapt
 bin/aapt.exe                            strip build-tools/${PLATFORM_NAME}/aapt.exe
@@ -56,6 +59,12 @@ bin/dexdump.exe                         strip build-tools/${PLATFORM_NAME}/dexdu
 rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
 bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
 
+lib/libLLVM.dll                               build-tools/${PLATFORM_NAME}/libLLVM.dll
+lib/libclang.dll                              build-tools/${PLATFORM_NAME}/libclang.dll
+#bcc not yet compiled on windows
+#lib/libbcc.dll                                build-tools/${PLATFORM_NAME}/libbcc.dll
+#lib/libbcinfo.dll                             build-tools/${PLATFORM_NAME}/libbcinfo.dll
+
 
 
 ##############################################################################
diff --git a/build/sdk.atree b/build/sdk.atree
index 5f7a27256..495b9288d 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -73,11 +73,14 @@ development/sdk/build_tools_source.properties  build-tools/${PLATFORM_NAME}/sour
 # build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
 bin/aapt                                strip build-tools/${PLATFORM_NAME}/aapt
 bin/aidl                                strip build-tools/${PLATFORM_NAME}/aidl
+
 # renderscript (cc + headers)
 bin/llvm-rs-cc                          strip build-tools/${PLATFORM_NAME}/llvm-rs-cc
 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
+
 # dx
 bin/dx                                        build-tools/${PLATFORM_NAME}/dx
 framework/dx.jar                              build-tools/${PLATFORM_NAME}/lib/dx.jar
-- 
cgit v1.2.3