commit 72904774a35d395116bb784b5d2adc1a8d637e8e
author Shinichiro Hamaji <hamaji@google.com> Wed Mar 16 06:40:04 2016 +0900
committer Shinichiro Hamaji <hamaji@google.com> Wed Mar 16 06:40:04 2016 +0900
tree 8152428dd2b5fcd785f32f5963cf477c3b121fb7
parent 3c37889299b7ab8df676fed7b8157484a7e5315a

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

diff --git a/core/binary.mk b/core/binary.mk
index 9336ac6..dc43463 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1069,7 +1069,7 @@
 $(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))

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 15fadd5..f883122 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1366,7 +1366,7 @@
 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 @@
 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 @@
 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