Merge "Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE" into oc-dev (e3dc10ab) · Commits · e / os / android_build

target/board/Android.mk

+10 −0

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

	$(GEN): PRIVATE_FLAGS :=		$(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		ifdef BUILT_VENDOR_MATRIX
	$(GEN): $(BUILT_VENDOR_MATRIX)		$(GEN): $(BUILT_VENDOR_MATRIX)
	$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MATRIX)"		$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MATRIX)"
	endif		endif
			endif

	$(GEN): $(FRAMEWORK_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf		$(GEN): $(FRAMEWORK_MANIFEST_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf
	BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) $(HOST_OUT_EXECUTABLES)/assemble_vintf -i $< -o $@ $(PRIVATE_FLAGS)		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 := $(local-generated-sources-dir)/compatibility_matrix.xml

	$(GEN): PRIVATE_FLAGS :=		$(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		ifdef BUILT_VENDOR_MANIFEST
	$(GEN): $(BUILT_VENDOR_MANIFEST)		$(GEN): $(BUILT_VENDOR_MANIFEST)
	$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)"		$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)"
	endif		endif
			endif

	$(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf		$(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.		# TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled.