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

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

Merge "Use KATI_DEPFILE for .P associated with object files" 

am: b95dc310

* commit 'b95dc310':
  Use KATI_DEPFILE for .P associated with object files
parents 30ec3f37 b95dc310

core/binary.mk

+9 −10
Original line number Original line Diff line number Diff line
@@ -679,7 +679,7 @@ ifeq ($(my_proto_source_suffix),.c) 
else

else

	$(transform-$(PRIVATE_HOST)cpp-to-o)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

endif

endif

-include $(proto_generated_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(proto_generated_objects))





my_c_includes += $(my_proto_c_includes)

my_c_includes += $(my_proto_c_includes)

# Auto-export the generated proto source dir.

# Auto-export the generated proto source dir.
@@ -894,7 +894,7 @@ $(cpp_objects): $(intermediates)/%.o: \ 
    $(yacc_cpps) $(proto_generated_headers) \

    $(yacc_cpps) $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

-include $(cpp_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(cpp_objects))

endif

endif





cpp_objects += $(dotdot_arm_objects) $(dotdot_objects)

cpp_objects += $(dotdot_arm_objects) $(dotdot_objects)
@@ -917,7 +917,7 @@ $(gen_cpp_objects): $(intermediates)/%.o: \ 
    $(proto_generated_headers) \

    $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

-include $(gen_cpp_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(gen_cpp_objects))

endif

endif





###########################################################

###########################################################
@@ -932,7 +932,7 @@ ifneq ($(strip $(gen_S_sources)),) 
$(gen_S_objects): $(intermediates)/%.o: $(intermediates)/%.S \

$(gen_S_objects): $(intermediates)/%.o: $(intermediates)/%.S \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)s-to-o)

	$(transform-$(PRIVATE_HOST)s-to-o)

-include $(gen_S_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(gen_S_objects))

endif

endif





gen_s_sources := $(filter %.s,$(my_generated_sources))

gen_s_sources := $(filter %.s,$(my_generated_sources))
@@ -943,7 +943,6 @@ ifneq ($(strip $(gen_s_objects)),) 
$(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \

$(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)s-to-o-no-deps)

	$(transform-$(PRIVATE_HOST)s-to-o-no-deps)

-include $(gen_s_objects:%.o=%.P)

endif

endif





gen_asm_objects := $(gen_S_objects) $(gen_s_objects)

gen_asm_objects := $(gen_S_objects) $(gen_s_objects)
@@ -997,7 +996,7 @@ ifneq ($(strip $(c_objects)),) 
$(c_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.c $(yacc_cpps) $(proto_generated_headers) \

$(c_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.c $(yacc_cpps) $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)c-to-o)

	$(transform-$(PRIVATE_HOST)c-to-o)

-include $(c_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(c_objects))

endif

endif





c_objects += $(dotdot_arm_objects) $(dotdot_objects)

c_objects += $(dotdot_arm_objects) $(dotdot_objects)
@@ -1018,7 +1017,7 @@ $(gen_c_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) 
$(gen_c_objects): $(intermediates)/%.o: $(intermediates)/%.c $(yacc_cpps) $(proto_generated_headers) \

$(gen_c_objects): $(intermediates)/%.o: $(intermediates)/%.c $(yacc_cpps) $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)c-to-o)

	$(transform-$(PRIVATE_HOST)c-to-o)

-include $(gen_c_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(gen_c_objects))

endif

endif





###########################################################

###########################################################
@@ -1033,7 +1032,7 @@ ifneq ($(strip $(objc_objects)),) 
$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) \

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)m-to-o)

	$(transform-$(PRIVATE_HOST)m-to-o)

-include $(objc_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(objc_objects))

endif

endif





###########################################################

###########################################################
@@ -1048,7 +1047,7 @@ ifneq ($(strip $(objcpp_objects)),) 
$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm $(yacc_cpps) $(proto_generated_headers) \

$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm $(yacc_cpps) $(proto_generated_headers) \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)mm-to-o)

	$(transform-$(PRIVATE_HOST)mm-to-o)

-include $(objcpp_objects:%.o=%.P)

$(call include-depfiles-for-objs, $(objcpp_objects))

endif

endif





###########################################################

###########################################################
@@ -1072,7 +1071,7 @@ ifneq ($(strip $(asm_objects_S)),) 
$(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \

$(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \

    $(my_additional_dependencies)

    $(my_additional_dependencies)

	$(transform-$(PRIVATE_HOST)s-to-o)

	$(transform-$(PRIVATE_HOST)s-to-o)

-include $(asm_objects_S:%.o=%.P)

$(call include-depfiles-for-objs, $(asm_objects))

endif

endif





asm_sources_s := $(filter %.s,$(my_src_files))

asm_sources_s := $(filter %.s,$(my_src_files))

core/definitions.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -885,6 +885,11 @@ define include-depfile 
$(eval $(2) : .KATI_DEPFILE := $1)

$(eval $(2) : .KATI_DEPFILE := $1)

endef

endef





# $(1): object files

define include-depfiles-for-objs

$(foreach obj, $(1), $(call include-depfile, $(obj:%.o=%.P), $(obj)))

endef



###########################################################

###########################################################

## Track source files compiled to objects

## Track source files compiled to objects

###########################################################

###########################################################

core/ninja.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ $(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper 
.PHONY: ninja_wrapper

.PHONY: ninja_wrapper

ninja_wrapper: $(COMBINED_BUILD_NINJA) $(MAKEPARALLEL)

ninja_wrapper: $(COMBINED_BUILD_NINJA) $(MAKEPARALLEL)

	@echo Starting build with ninja

	@echo Starting build with ninja

	+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)

	+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) -d keepdepfile $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)





KATI_FIND_EMULATOR := --use_find_emulator

KATI_FIND_EMULATOR := --use_find_emulator

ifeq ($(KATI_EMULATE_FIND),false)

ifeq ($(KATI_EMULATE_FIND),false)