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

Commit a840faef authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated." 

* commit 'c35e7902':
  Move the inclusion of depfile to where it's generated.
parents 0216641e c35e7902

core/java.mk

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