diff options
| author | Ying Wang <wangying@google.com> | 2015-04-04 01:49:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-04 01:49:47 +0000 |
| commit | 11e923a0e545ac6935f471e1ed894a6a270cd346 (patch) | |
| tree | d0f73abfdabc8a49c8c7b2c379c5c58b701a51e6 /core/binary.mk | |
| parent | c5b06258f04cb8c521a48d4679ae1c0ea46450bb (diff) | |
| parent | ea5178545bf939fb65f77cd54eba9f274512638b (diff) | |
| download | build-11e923a0e545ac6935f471e1ed894a6a270cd346.zip build-11e923a0e545ac6935f471e1ed894a6a270cd346.tar.gz build-11e923a0e545ac6935f471e1ed894a6a270cd346.tar.bz2 | |
am ea517854: am aacc8bb4: am 18ecae31: Merge "Convert bc depfiles to .P files."
* commit 'ea5178545bf939fb65f77cd54eba9f274512638b':
Convert bc depfiles to .P files.
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/binary.mk b/core/binary.mk index 9a4077f..a45e439 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -451,18 +451,20 @@ ifneq ($(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE),) renderscript_includes := $(LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE) endif +bc_dep_files := $(addprefix $(renderscript_intermediate)/, \ + $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))) + $(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(renderscript_includes) $(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC) $(RenderScript_file_stamp): PRIVATE_RS_FLAGS := $(renderscript_flags) $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath) $(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate) +$(RenderScript_file_stamp): PRIVATE_DEP_FILES := $(bc_dep_files) $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC) $(transform-renderscripts-to-cpp-and-bc) -# include the dependency files (.d) generated by llvm-rs-cc. -renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate)/, \ - $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))) --include $(renderscript_generated_dep_files) +# include the dependency files (.d/.P) generated by llvm-rs-cc. +-include $(bc_dep_files:%.d=%.P) LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp) |