commit d4136c0fc67d4330194ea4e612117e84be110d8b
author Stephen Hines <srhines@google.com> Tue Aug 23 22:01:49 2011 -0700
committer Stephen Hines <srhines@google.com> Tue Aug 23 22:01:49 2011 -0700
tree 6b080f0378d6e7ba3ed736ec5f731ab771130d77
parent c7fd4a5a7b33ca1ae528940e132fe301abe4fb61

Provide mechanism to override llvm-rs-cc headers.

Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index bc085f5..1b9bb8a 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -104,6 +104,7 @@
 LOCAL_WARNINGS_ENABLE:=
 LOCAL_MANIFEST_FILE:=
 LOCAL_RENDERSCRIPT_INCLUDES:=
+LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE:=
 LOCAL_RENDERSCRIPT_CC:=
 LOCAL_BUILD_HOST_DEX:=
 LOCAL_DEX_PREOPT:=

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 677e3de..1b15720 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -166,6 +166,10 @@
     $(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)