Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e41a748 authored Aug 24, 2011 by Ying Wang Committed by Android (Google) Code Review Aug 24, 2011

Merge "Provide mechanism to override llvm-rs-cc headers."

parents ca94f358 d4136c0f

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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:=

core/java.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)