From 72904774a35d395116bb784b5d2adc1a8d637e8e Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Wed, 16 Mar 2016 06:40:04 +0900 Subject: [PATCH] Replace last -includes by .KATI_DEPFILE There was a typo in binary.mk. compile-dotdot-XXX-file in definitions.mk was also using -include. Bug: 26839129 Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800 --- core/binary.mk | 2 +- core/definitions.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 9336ac6f7b..dc43463304 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1069,7 +1069,7 @@ ifneq ($(strip $(asm_objects_S)),) $(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \ $(my_additional_dependencies) $(transform-$(PRIVATE_HOST)s-to-o) -$(call include-depfiles-for-objs, $(asm_objects)) +$(call include-depfiles-for-objs, $(asm_objects_S)) endif asm_sources_s := $(filter %.s,$(my_src_files)) diff --git a/core/definitions.mk b/core/definitions.mk index 15fadd5e51..f883122f83 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1366,7 +1366,7 @@ define compile-dotdot-cpp-file o := $(intermediates)/$(patsubst %$(LOCAL_CPP_EXTENSION),%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(transform-$$(PRIVATE_HOST)cpp-to-o) --include $$(o:%.o=%.P) +$$(call include-depfiles-for-objs, $$(o)) $(3) += $$(o) endef @@ -1379,7 +1379,7 @@ define compile-dotdot-c-file o := $(intermediates)/$(patsubst %.c,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(transform-$$(PRIVATE_HOST)c-to-o) --include $$(o:%.o=%.P) +$$(call include-depfiles-for-objs, $$(o)) $(3) += $$(o) endef @@ -1392,7 +1392,7 @@ define compile-dotdot-s-file o := $(intermediates)/$(patsubst %.S,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(transform-$$(PRIVATE_HOST)s-to-o) --include $$(o:%.o=%.P) +$$(call include-depfiles-for-objs, $$(o)) $(3) += $$(o) endef