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

Commit 7e7a702b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "vintf recovery install parity w/ init_rc" am: ec71cbf0 am: b77d3c2e am: ad2d80bb 

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

Change-Id: Ie7d6946ada77881f8004cad9db090fa8ff5df02e
parents 86250621 ad2d80bb

core/base_rules.mk

+6 −2
Original line number Diff line number Diff line
@@ -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