Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 082d5e50 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by android-build-merger
Browse files

Merge "Replace last -includes by .KATI_DEPFILE" 

am: c26ec724

* commit 'c26ec724':
  Replace last -includes by .KATI_DEPFILE
parents c9a19779 c26ec724

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,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))

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -1348,7 +1348,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
@@ -1361,7 +1361,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
@@ -1374,7 +1374,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