From d4136c0fc67d4330194ea4e612117e84be110d8b Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 23 Aug 2011 22:01:49 -0700 Subject: [PATCH] Provide mechanism to override llvm-rs-cc headers. Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0 --- core/clear_vars.mk | 1 + core/java.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index bc085f5d73..1b9bb8a8ea 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -104,6 +104,7 @@ LOCAL_EMMA_COVERAGE_FILTER:= LOCAL_WARNINGS_ENABLE:= LOCAL_MANIFEST_FILE:= LOCAL_RENDERSCRIPT_INCLUDES:= +LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE:= LOCAL_RENDERSCRIPT_CC:= LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= diff --git a/core/java.mk b/core/java.mk index 677e3deaa4..1b15720609 100644 --- a/core/java.mk +++ b/core/java.mk @@ -166,6 +166,10 @@ LOCAL_RENDERSCRIPT_INCLUDES := \ $(LOCAL_RENDERSCRIPT_INCLUDES) endif +ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),) +LOCAL_RENDERSCRIPT_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE) +endif + $(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES) $(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC) $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)