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

Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0c8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1877977

Change-Id: I469d02a67f108bab09966adc447ea5430b5ffcaf
This commit is contained in:
Steven Moreland
2021-11-04 22:47:55 +00:00
committed by Automerger Merge Worker
parent 5c8fc606d4 ec71cbf0c8
commit b77d3c2e9b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/base_rules.mk
View File

@@ -554,6 +554,7 @@ endif # !LOCAL_UNINSTALLABLE_MODULE
###########################################################
my_vintf_installed:=
my_vintf_path:=
my_vintf_pairs:=
my_init_rc_installed :=
my_init_rc_path :=
@@ -567,8 +568,11 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
my_vintf_fragments := $(foreach xml,$(LOCAL_VINTF_FRAGMENTS),$(LOCAL_PATH)/$(xml))
endif
ifneq ($(strip $(my_vintf_fragments)),)
my_vintf_pairs := $(foreach xml,$(my_vintf_fragments),$(xml):$(TARGET_OUT$(partition_tag)_ETC)/vintf/manifest/$(notdir $(xml)))
# Make doesn't support recovery as an output partition, but some Soong modules installed in recovery
# have init.rc files that need to be installed alongside them. Manually handle the case where the
# output file is in the recovery partition.
my_vintf_path := $(if $(filter $(TARGET_RECOVERY_ROOT_OUT)/%,$(my_module_path)),$(TARGET_RECOVERY_ROOT_OUT)/system/etc,$(TARGET_OUT$(partition_tag)_ETC))
my_vintf_pairs := $(foreach xml,$(my_vintf_fragments),$(xml):$(my_vintf_path)/vintf/manifest/$(notdir $(xml)))
my_vintf_installed := $(foreach xml,$(my_vintf_pairs),$(call word-colon,2,$(xml)))
# Only set up copy rules once, even if another arch variant shares it