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

Commit 953981db authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Don't add dependencies on Makefiles when using ninja"

parents 6c3bf1b8 a4447e8c

core/base_rules.mk

+10 −0
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ ifeq ($(my_host_cross),true) 
  my_module_tags :=

endif



ifdef BUILDING_WITH_NINJA

# Ninja has an implicit dependency on the command being run, and kati will

# regenerate the ninja manifest if any read makefile changes, so there is no

# need to have dependencies on makefiles.

# This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains

# a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't include

# base_rules.mk, but it will fix the most common ones.

LOCAL_ADDITIONAL_DEPENDENCIES := $(filter-out %.mk,$(LOCAL_ADDITIONAL_DEPENDENCIES))

endif



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

## Validate and define fallbacks for input LOCAL_* variables.

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

core/binary.mk

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ my_cxx_wrapper := $(CXX_WRAPPER) 
my_c_includes := $(LOCAL_C_INCLUDES)

my_generated_sources := $(LOCAL_GENERATED_SOURCES)

my_native_coverage := $(LOCAL_NATIVE_COVERAGE)

my_additional_dependencies := $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES)

my_additional_dependencies := $(LOCAL_MODULE_MAKEFILE_DEP) $(LOCAL_ADDITIONAL_DEPENDENCIES)

my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS)



ifdef LOCAL_IS_HOST_MODULE
@@ -1029,7 +1029,7 @@ import_includes_deps := $(strip \ 
    $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \

      $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps)

$(import_includes) : $(LOCAL_MODULE_MAKEFILE) $(import_includes_deps)

$(import_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(import_includes_deps)

	@echo Import includes file: $@

	$(hide) mkdir -p $(dir $@) && rm -f $@

ifdef import_includes_deps
@@ -1237,7 +1237,7 @@ $(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets) 
export_includes := $(intermediates)/export_includes

$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(my_export_c_include_dirs)

# Make sure .pb.h are already generated before any dependent source files get compiled.

$(export_includes) : $(LOCAL_MODULE_MAKEFILE) $(proto_generated_headers) $(dbus_generated_headers)

$(export_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(proto_generated_headers) $(dbus_generated_headers)

	@echo Export includes file: $< -- $@

	$(hide) mkdir -p $(dir $@) && rm -f $@

ifdef my_export_c_include_dirs

core/definitions.mk

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ endef 
define my-dir

$(strip \

  $(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \

  $(eval LOCAL_MODULE_MAKEFILE_DEP := $(if $(BUILDING_WITH_NINJA),,$$(LOCAL_MODULE_MAKEFILE))) \

  $(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \

    $(error my-dir must be called before including any other makefile.) \

   , \

core/droiddoc.mk

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ $(full_target): \ 
        $(droiddoc) \

        $(html_dir_files) \

        $(full_java_lib_deps) \

        $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_MODULE_MAKEFILE_DEP) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	@echo Docs droiddoc: $(PRIVATE_OUT_DIR)

	$(hide) mkdir -p $(dir $@)

core/executable_prefer_symlink.mk

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $(my_symlink): PRIVATE_SRC_BINARY_NAME := $(LOCAL_MODULE_STEM_32) 
  endif

endif



$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE)

$(my_symlink): $(LOCAL_INSTALLED_MODULE) $(LOCAL_MODULE_MAKEFILE_DEP)

	@echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"

	@mkdir -p $(dir $@)

	@rm -rf $@