LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the renderscript include files into platform-tools

Browse Source 
The new unique compiler working for all target platforms requires to use
only the latest includes instead of using a different set per target
platforms.

By putting the include in the platform-tools, we ensure that they are
available no matter which platform has been donwloaded and are in sync
with the compiler.

Change-Id: Ia5d3d155eeb45c546656123f8cc75d8efe6e631c
This commit is contained in:
Xavier Ducrohet
2011-10-21 13:45:47 -07:00
parent d9c6ed7ee8
commit 676e13ff60
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/sdk.atree
View File

@@ -37,6 +37,8 @@ frameworks/base/docs/docs-redirect.html documentation.html
# Platform Tools Component # Platform Tools Component
############################################################################## ##############################################################################
development/sdk/plat_tools_source.properties platform-tools/source.properties
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ # host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/adb strip platform-tools/adb bin/adb strip platform-tools/adb
bin/aapt strip platform-tools/aapt bin/aapt strip platform-tools/aapt
@@ -48,7 +50,11 @@ bin/dx platform-tools/dx
bin/dexdump platform-tools/dexdump bin/dexdump platform-tools/dexdump
framework/dx.jar platform-tools/lib/dx.jar framework/dx.jar platform-tools/lib/dx.jar
development/sdk/plat_tools_source.properties platform-tools/source.properties
# Framework include for Renderscript
frameworks/base/libs/rs/scriptc platform-tools/renderscript/include
external/clang/lib/Headers platform-tools/renderscript/clang-include
external/clang/LICENSE.TXT platform-tools/renderscript/clang-include/LICENSE.TXT
############################################################################## ##############################################################################
# Platform Component # Platform Component
@@ -66,11 +72,6 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar pla
# the aidl precompiled include # the aidl precompiled include
obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
# Framework include for Renderscript
frameworks/base/libs/rs/scriptc platforms/${PLATFORM_NAME}/renderscript/include
external/clang/lib/Headers platforms/${PLATFORM_NAME}/renderscript/clang-include
external/clang/LICENSE.TXT platforms/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
# emulator skins from sdk.git # emulator skins from sdk.git
development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA
development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432 development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432

2
sdk/plat_tools_source.properties
View File

@@ -1,2 +1,2 @@
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=8 Pkg.Revision=9