diff options
| author | Ying Wang <wangying@google.com> | 2011-08-24 10:26:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-24 10:26:41 -0700 |
| commit | 6e41a7483aea711cb81c2223724c421468872803 (patch) | |
| tree | 72c661fca301ea1ea4f4e13ee0d91b8bdee6d36e /core | |
| parent | ca94f3583f33bb8dc5243dcbb50738fff9f945d1 (diff) | |
| parent | d4136c0fc67d4330194ea4e612117e84be110d8b (diff) | |
| download | build-6e41a7483aea711cb81c2223724c421468872803.zip build-6e41a7483aea711cb81c2223724c421468872803.tar.gz build-6e41a7483aea711cb81c2223724c421468872803.tar.bz2 | |
Merge "Provide mechanism to override llvm-rs-cc headers."
Diffstat (limited to 'core')
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/java.mk | 4 |
2 files changed, 5 insertions, 0 deletions
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_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 3737d06..c92e439 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) |