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
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 118ed1c..11d4a19 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -15,6 +15,19 @@
#
##############################################################################
+# 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 e21785e..7b1f6dd 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 c9ec5f9..c8be434 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -41,6 +41,9 @@
##############################################################################
# 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 @@
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 5f7a272..495b928 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -73,11 +73,14 @@
# 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
diff --git a/sdk/build_tools_source.properties b/sdk/build_tools_source.properties
index c7c8a05..1ac7da0 100644
--- a/sdk/build_tools_source.properties
+++ b/sdk/build_tools_source.properties
@@ -1,3 +1,3 @@
Pkg.UserSrc=false
-Pkg.Revision=18.0.0
+Pkg.Revision=18.0.1
