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

Commit 5b6f5a7b authored by Liz Kammer's avatar Liz Kammer
Browse files

Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path 

Soong supports references to other modules for vintf_fragments property,
so full paths need to be passed from Soong to make rather than module
local paths.

Test: m droid
Bug: 184567830
Change-Id: Ia7f1cf977de8aeb08d41624277ff6231198222e5
parent 507e84a2

core/base_rules.mk

+7 −2
Original line number Diff line number Diff line
@@ -573,9 +573,14 @@ my_vintf_installed:= 
my_vintf_pairs:=

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifndef LOCAL_IS_HOST_MODULE

ifneq ($(strip $(LOCAL_VINTF_FRAGMENTS)),)

ifneq ($(strip $(LOCAL_FULL_VINTF_FRAGMENTS)),)

my_vintf_fragments := $(LOCAL_FULL_VINTF_FRAGMENTS)

else

my_vintf_fragments := $(foreach xml,$(LOCAL_VINTF_FRAGMENTS),$(LOCAL_PATH)/$(xml))

endif

ifneq ($(strip $(my_vintf_fragments)),)



my_vintf_pairs := $(foreach xml,$(LOCAL_VINTF_FRAGMENTS),$(LOCAL_PATH)/$(xml):$(TARGET_OUT$(partition_tag)_ETC)/vintf/manifest/$(notdir $(xml)))

my_vintf_pairs := $(foreach xml,$(my_vintf_fragments),$(xml):$(TARGET_OUT$(partition_tag)_ETC)/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

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ LOCAL_FULL_INIT_RC:= 
LOCAL_FULL_LIBS_MANIFEST_FILES:=

LOCAL_FULL_MANIFEST_FILE:=

LOCAL_FULL_TEST_CONFIG:=

LOCAL_FULL_VINTF_FRAGMENTS:=

LOCAL_FUZZ_ENGINE:=

LOCAL_FUZZ_INSTALLED_SHARED_DEPS:=

LOCAL_GCNO_FILES:=