From 1a9f6bf710d1e437b62fe49ff616fca814066982 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Fri, 21 Oct 2011 13:45:47 -0700 Subject: [PATCH] CherryPick 676e13 from master to mr0. do not merge. Move the renderscript include files into platform-tools 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: Ib3e8e4e0b02956f60e7f1b4a2e8584a83a33d013 --- build/sdk.atree | 13 +++++++------ sdk/plat_tools_source.properties | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index ba7cb86f0..5996c9ccb 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -37,6 +37,8 @@ frameworks/base/docs/docs-redirect.html documentation.html # Platform Tools Component ############################################################################## +development/sdk/plat_tools_source.properties platform-tools/source.properties + # host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ bin/adb strip platform-tools/adb bin/aapt strip platform-tools/aapt @@ -48,7 +50,11 @@ bin/dx platform-tools/dx bin/dexdump platform-tools/dexdump 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 @@ -66,11 +72,6 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar pla # the aidl precompiled include 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 development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432 diff --git a/sdk/plat_tools_source.properties b/sdk/plat_tools_source.properties index 189bca5b2..bb8fd8c58 100644 --- a/sdk/plat_tools_source.properties +++ b/sdk/plat_tools_source.properties @@ -1,2 +1,2 @@ Pkg.UserSrc=false -Pkg.Revision=8 \ No newline at end of file +Pkg.Revision=9 \ No newline at end of file