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

Commit 18a2ebc4 authored by Devin Moore's avatar Devin Moore Committed by Gerrit Code Review
Browse files

Merge "consolidate filter commands for check_vintf_vendor_deps" into main

parents 0b29218f 6795ca78

core/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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