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
This commit is contained in:
Xavier Ducrohet
2013-07-25 10:40:54 -07:00
parent af0ab077f3
commit afda1d33de
5 changed files with 39 additions and 1 deletions

View File

@@ -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
##############################################################################

View File

@@ -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

View File

@@ -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
##############################################################################

View File

@@ -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

View File

@@ -1,3 +1,3 @@
Pkg.UserSrc=false
Pkg.Revision=18.0.0
Pkg.Revision=18.0.1