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

Merge "Skip check_vintf_system_deps if not building system image" into main am: 0656d0a451

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

Change-Id: I8e8b02963e741743f6725596bcc07790728d0f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-Yo Chiang
2024-02-26 03:23:47 +00:00
committed by Automerger Merge Worker
parent 00ae5874ea 0656d0a451
commit 5e8c4e77d2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@@ -5110,6 +5110,7 @@ $(error EMPTY_VENDOR_SKU_PLACEHOLDER is an internal variable and cannot be used
endif endif
# -- Check system and system_ext manifests / matrices including fragments (excluding other framework manifests / matrices, e.g. product); # -- 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/% \ check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/% \
$(TARGET_OUT_SYSTEM_EXT)/etc/vintf/%, \ $(TARGET_OUT_SYSTEM_EXT)/etc/vintf/%, \
$(check_vintf_common_srcs)) $(check_vintf_common_srcs))
@@ -5139,6 +5140,8 @@ $(call declare-1p-target,$(vintffm_log))
endif # check_vintf_system_deps endif # check_vintf_system_deps
check_vintf_system_deps := check_vintf_system_deps :=
endif # BUILDING_SYSTEM_IMAGE
# -- Check vendor manifest / matrix including fragments (excluding other device manifests / matrices) # -- Check vendor manifest / matrix including fragments (excluding other device manifests / matrices)
check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/% \ check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/% \
$(TARGET_OUT_VENDOR)/apex/%, \ $(TARGET_OUT_VENDOR)/apex/%, \