diff options
| -rw-r--r-- | core/base_rules.mk | 33 | ||||
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | target/product/gsi/gsi_skip_mount.cfg | 1 |
3 files changed, 33 insertions, 6 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 9818d60fd6..d604480be1 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -452,12 +452,33 @@ endif # Set up phony targets that covers all modules under the given paths. # This allows us to build everything in given paths by running mmma/mma. -my_path_components := $(subst /,$(space),$(LOCAL_PATH)) -my_path_prefix := MODULES-IN -$(foreach c, $(my_path_components),\ - $(eval my_path_prefix := $(my_path_prefix)-$(c))\ - $(eval .PHONY : $(my_path_prefix))\ - $(eval $(my_path_prefix) : $(my_all_targets))) +define my_path_comp +parent := $(patsubst %/,%,$(dir $(1))) +parent_target := MODULES-IN-$$(subst /,-,$$(parent)) +.PHONY: $$(parent_target) +$$(parent_target): $(2) +ifndef $$(parent_target) + $$(parent_target) := true + ifneq (,$$(findstring /,$$(parent))) + $$(eval $$(call my_path_comp,$$(parent),$$(parent_target))) + endif +endif +endef + +_local_path := $(patsubst %/,%,$(LOCAL_PATH)) +_local_path_target := MODULES-IN-$(subst /,-,$(_local_path)) + +.PHONY: $(_local_path_target) +$(_local_path_target): $(my_register_name) + +ifndef $(_local_path_target) + $(_local_path_target) := true + $(eval $(call my_path_comp,$(_local_path),$(_local_path_target))) +endif + +_local_path := +_local_path_target := +my_path_comp := ########################################################### ## Module installation rule diff --git a/core/main.mk b/core/main.mk index e7b18dc5a2..12bb8a4c82 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1704,6 +1704,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) $(call dist-for-goals, dist_files, $(api_xmls)) api_xmls := + ifdef CLANG_COVERAGE + $(foreach f,$(SOONG_NDK_API_XML), \ + $(call dist-for-goals,droidcore,$(f):ndk_coverage_xml_dir/$(notdir $(f)))) + endif + # Building a full system-- the default is to build droidcore droid_targets: droidcore dist_files diff --git a/target/product/gsi/gsi_skip_mount.cfg b/target/product/gsi/gsi_skip_mount.cfg index 3f812cb000..ad3c7d9382 100644 --- a/target/product/gsi/gsi_skip_mount.cfg +++ b/target/product/gsi/gsi_skip_mount.cfg @@ -1,2 +1,3 @@ +/oem /product /system_ext |