Merge "Move the inclusion of depfile to where it's generated." (555b7770) · Commits · e / os / android_build

core/java.mk

+5 −5

Original line number	Original line	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)		$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC)
	$(transform-renderscripts-to-java-and-bc)		$(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),)		ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
	bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))		bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))

	@@ -248,11 +253,6 @@ endif

	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)		LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)
	# Make sure the generated resource will be added to the apk.		# Make sure the generated resource will be added to the apk.
	LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR)		LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR)