Merge "consolidate filter commands for check_vintf_vendor_deps" into main am: 18a2ebc4ab am: b3d429a72f

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

Change-Id: I49a9cbfa114ee0301412f1c1057e04c578da7a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore 2024-02-16 20:15:29 +00:00 committed by Automerger Merge Worker
commit 5bf58fdd70

View file

@ -5140,8 +5140,9 @@ endif # check_vintf_system_deps
check_vintf_system_deps :=
# -- Check vendor manifest / matrix including fragments (excluding other device manifests / matrices)
check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/%, $(check_vintf_common_srcs))
check_vintf_vendor_deps += $(filter $(TARGET_OUT_VENDOR)/apex/%, $(check_vintf_common_srcs))
check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/% \
$(TARGET_OUT_VENDOR)/apex/%, \
$(check_vintf_common_srcs))
ifneq ($(strip $(check_vintf_vendor_deps)),)
check_vintf_has_vendor := true
check_vintf_vendor_log := $(intermediates)/check_vintf_vendor.log