StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I16be0dcb,I4656d43d,I52b831df into main

Browse Source 
* changes:
  Do not install required modules from order-only deps
  Install vintf_fragments/init_rc along with targets
  Install vintf_fragments even when they are shared
This commit is contained in:
Jooyung Han
2023-07-13 01:29:47 +00:00
committed by Gerrit Code Review
parent 3505f2b3a4 2ecded04a6
commit b51bc1c77e
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/base_rules.mk
View File

@@ -578,7 +578,9 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
ALL_VINTF_MANIFEST_FRAGMENTS_LIST += $(my_vintf_new_pairs)
$(my_all_targets) : $(my_vintf_new_installed)
$(my_all_targets) : $(my_vintf_installed)
# Install fragments together with the target
$(LOCAL_INSTALLED_MODULE) : | $(my_vintf_installed)
endif # my_vintf_fragments
# Rule to install the module's companion init.rc.
@@ -615,6 +617,8 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
ALL_INIT_RC_INSTALLED_PAIRS += $(my_init_rc_new_pairs)
$(my_all_targets) : $(my_init_rc_installed)
# Install init_rc together with the target
$(LOCAL_INSTALLED_MODULE) : | $(my_init_rc_installed)
endif # my_init_rc
endif # !LOCAL_IS_HOST_MODULE
@@ -975,6 +979,11 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))
$(my_init_rc_pairs) \
$(my_test_data_pairs) \
$(my_vintf_pairs))
# Store the list of vintf/init_rc as order-only dependencies
ALL_MODULES.$(my_register_name).ORDERONLY_INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).ORDERONLY_INSTALLED) \
$(my_init_rc_installed) \
$(my_vintf_installed))
else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
ALL_MODULES.$(my_register_name).INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).INSTALLED) \
@@ -984,6 +993,10 @@ else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
$(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \
$(LOCAL_BUILT_MODULE):$(LOCAL_INSTALLED_MODULE) \
$(my_init_rc_pairs) $(my_test_data_pairs) $(my_vintf_pairs))
ALL_MODULES.$(my_register_name).ORDERONLY_INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).ORDERONLY_INSTALLED) \
$(my_init_rc_installed) \
$(my_vintf_installed))
endif
ifdef LOCAL_PICKUP_FILES
# Files or directories ready to pick up by the build system

2
core/main.mk
View File

@@ -810,12 +810,14 @@ $(call add-all-host-cross-to-host-cross-required-modules-deps)
# Sets up dependencies such that whenever a target module is installed,
# any other target modules listed in $(ALL_MODULES.$(m).REQUIRED_FROM_TARGET) will also be installed
# This doesn't apply to ORDERONLY_INSTALLED items.
define add-all-target-to-target-required-modules-deps
$(foreach m,$(ALL_MODULES), \
$(eval r := $(ALL_MODULES.$(m).REQUIRED_FROM_TARGET)) \
$(if $(r), \
$(eval r := $(call module-installed-files,$(r))) \
$(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \
$(eval t_m := $(filter-out $(ALL_MODULES.$(m).ORDERONLY_INSTALLED), $(ALL_MODULES.$(m).INSTALLED))) \
$(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \
$(eval t_r := $(filter-out $(t_m), $(t_r))) \
$(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \