diff options
| author | Ying Wang <wangying@google.com> | 2015-04-03 09:53:41 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-04-03 09:53:41 -0700 |
| commit | cddece6f8ff20f1776b838a79b31ccb6f188ea78 (patch) | |
| tree | ab0a79d05746db105f8977178516a091bf7dc668 /core/java.mk | |
| parent | 62003acdcc2ecdc13ce2a9880c35147d2070e865 (diff) | |
| download | build-cddece6f8ff20f1776b838a79b31ccb6f188ea78.zip build-cddece6f8ff20f1776b838a79b31ccb6f188ea78.tar.gz build-cddece6f8ff20f1776b838a79b31ccb6f188ea78.tar.bz2 | |
Move the inclusion of depfile to where it's generated.
Change-Id: Ib7ed6d7d9105e49961ac467fd1d390060d4f5c38
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java.mk b/core/java.mk index cd90f03..55aa79b 100644 --- a/core/java.mk +++ b/core/java.mk @@ -191,6 +191,11 @@ $(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(renderscript_target_api) $(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC) $(transform-renderscripts-to-java-and-bc) +# include the dependency files (.d) generated by llvm-rs-cc. +renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/, \ + $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))) +-include $(renderscript_generated_dep_files) + ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),) bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources)))) @@ -248,11 +253,6 @@ endif endif -# include the dependency files (.d) generated by llvm-rs-cc. -renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/, \ - $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources))))) --include $(renderscript_generated_dep_files) - LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp) # Make sure the generated resource will be added to the apk. LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR) |