diff options
| author | Ying Wang <wangying@google.com> | 2015-04-03 17:39:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-03 17:39:56 +0000 |
| commit | 301bd9341fa265f5ae06bab7bf3d4f6a2c5c1616 (patch) | |
| tree | 18d8eb5fbd1e4a318cfafb98b0f2c305ee3848c9 /core/java.mk | |
| parent | 6494a6ef8fc80a2f8e6090a3ee99ac1b1170fbc6 (diff) | |
| parent | a840faef517a196e235a197992e8feb9f13c27b7 (diff) | |
| download | build-301bd9341fa265f5ae06bab7bf3d4f6a2c5c1616.zip build-301bd9341fa265f5ae06bab7bf3d4f6a2c5c1616.tar.gz build-301bd9341fa265f5ae06bab7bf3d4f6a2c5c1616.tar.bz2 | |
am a840faef: am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."
* commit 'a840faef517a196e235a197992e8feb9f13c27b7':
Move the inclusion of depfile to where it's generated.
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 1494c4b..369392a 100644 --- a/core/java.mk +++ b/core/java.mk @@ -199,6 +199,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)))) @@ -256,11 +261,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) |