commit 4a352c9df0b9e9f6cae8d26f6bdd6ee5884038ff
author Yifan Hong <elsk@google.com> Wed May 03 15:59:50 2017 -0700
committer Yifan Hong <elsk@google.com> Wed May 03 16:33:23 2017 -0700
tree 8182517d07a4bc8051e874e0076637cf516d55ac
parent b16f288beed8b8bd51d323dbf94a3371dc4a420e

Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE

Bug: 37954458
Bug: 37321309

Test: build with lunch bullhead (PRODUCT_FULL_TREBLE=false)
Test: build with lunch marlin   (PRODUCT_FULL_TREBLE=true)
Change-Id: I2f3f8e4439e3986b9af635ac52c116f352215642

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 7f8e349..4c804e0 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -73,10 +73,15 @@
 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 @@
 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.