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

Commit 5c93dbdf authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Skip check_vintf_system_deps if not building system image" into main... 

Merge "Skip check_vintf_system_deps if not building system image" into main am: 0656d0a4 am: 5e8c4e77

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



Change-Id: If3b4aab1f9fe229c625756f039f864628e1473ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79f56d87 5e8c4e77

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5110,6 +5110,7 @@ $(error EMPTY_VENDOR_SKU_PLACEHOLDER is an internal variable and cannot be used 
endif



# -- Check system and system_ext manifests / matrices including fragments (excluding other framework manifests / matrices, e.g. product);

ifdef BUILDING_SYSTEM_IMAGE

check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/% \

                                    $(TARGET_OUT_SYSTEM_EXT)/etc/vintf/%, \

                                    $(check_vintf_common_srcs))
@@ -5139,6 +5140,8 @@ $(call declare-1p-target,$(vintffm_log)) 
endif # check_vintf_system_deps

check_vintf_system_deps :=



endif # BUILDING_SYSTEM_IMAGE



# -- Check vendor manifest / matrix including fragments (excluding other device manifests / matrices)

check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/% \

                                    $(TARGET_OUT_VENDOR)/apex/%, \