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

Commit 9e4fa5a4 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Enforce no unused HALs when product matrix exists." 

am: d6b231fa

Change-Id: Ia9e45e84c7e5368f9f2594db62585990659e624d
parents 23ae5c0c d6b231fa

core/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -2559,10 +2559,9 @@ INTERNAL_VENDORIMAGE_FILES := \ 
ifdef BUILT_VENDOR_MANIFEST

BUILT_ASSEMBLED_VENDOR_MANIFEST := $(PRODUCT_OUT)/verified_assembled_vendor_manifest.xml

ifeq (true,$(strip $(PRODUCT_ENFORCE_VINTF_MANIFEST)))

ifdef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE

# TODO(b/65028233): turn this on globally

ifneq ($(strip $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE)),)

$(BUILT_ASSEMBLED_VENDOR_MANIFEST): PRIVATE_SYSTEM_ASSEMBLE_VINTF_ENV_VARS := VINTF_ENFORCE_NO_UNUSED_HALS=true

endif # DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE

endif # DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE or DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE

endif # PRODUCT_ENFORCE_VINTF_MANIFEST

$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(HOST_OUT_EXECUTABLES)/assemble_vintf

$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(BUILT_SYSTEM_MATRIX)