diff --git a/core/base_rules.mk b/core/base_rules.mk index c973997a8..56c11b139 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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 diff --git a/core/clear_vars.mk b/core/clear_vars.mk index faca97ae8..e2acb678d 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -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:=