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

Commit 2ae39fb2 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE" into... 

Merge "Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE" into oc-dev am: e3dc10ab
am: debfef46

Change-Id: I4a3ecee49ba3d760e3d97eedce35ff827860e4a5
parents b24b28ca debfef46

target/board/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -73,10 +73,15 @@ LOCAL_MODULE_PATH := $(TARGET_OUT) 
GEN := $(local-generated-sources-dir)/manifest.xml



$(GEN): PRIVATE_FLAGS :=



# TODO(b/37954458), (b/37321309) remove check of PRODUCT_FULL_TREBLE after

# putting device compatibility matrices for non-treble devices.

ifeq ($(PRODUCT_FULL_TREBLE),true)

ifdef BUILT_VENDOR_MATRIX

$(GEN): $(BUILT_VENDOR_MATRIX)

$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MATRIX)"

endif

endif



$(GEN): $(FRAMEWORK_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS)
@@ -95,10 +100,15 @@ LOCAL_MODULE_PATH := $(TARGET_OUT) 
GEN := $(local-generated-sources-dir)/compatibility_matrix.xml



$(GEN): PRIVATE_FLAGS :=



# TODO(b/37954458), (b/37321309) remove check of PRODUCT_FULL_TREBLE after

# putting complete HAL manifests on non-treble devices.

ifeq ($(PRODUCT_FULL_TREBLE),true)

ifdef BUILT_VENDOR_MANIFEST

$(GEN): $(BUILT_VENDOR_MANIFEST)

$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)"

endif

endif



$(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf

	# TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled.