commit 082d5e5081732c6c4d42069b2f3fd560dcce768d
author Shinichiro Hamaji <hamaji@google.com> Tue Mar 15 23:06:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 15 23:06:31 2016 +0000
tree 8b55435ad8a7e6fe4c6ca13df7620bf5dbee7db8
parent c9a19779a219bd9e4dd162d30249be7d22020c67
parent c26ec724b8b4d356573901f96e1a8ce728bdd1b1

Merge "Replace last -includes by .KATI_DEPFILE"
am: c26ec724b8

* commit 'c26ec724b8b4d356573901f96e1a8ce728bdd1b1':
  Replace last -includes by .KATI_DEPFILE

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 6943ac0..955d829 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1071,7 +1071,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 b674d1d..025e08c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1348,7 +1348,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
 
@@ -1361,7 +1361,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
 
@@ -1374,7 +1374,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