commit 0f846c73e10e9505b0dae61f5ef4c083921cc348
author Shinichiro Hamaji <hamaji@google.com> Wed Mar 16 06:40:04 2016 +0900
committer Colin Cross <ccross@android.com> Tue Mar 29 12:10:48 2016 -0700
tree df6a0c70b65efa386f9586b03b3b3187bb1427eb
parent 2fb7b61a2e2457b85ff1a56e36a8cb6f99db3e26

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
Bug: 27886012
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
(cherry picked from commit 72904774a35d395116bb784b5d2adc1a8d637e8e)

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index e517513..9aca9fd 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1374,7 +1374,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
 
@@ -1387,7 +1387,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
 
@@ -1400,7 +1400,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