Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023 am: cb71efa50a

am: 18d75a29c3

Change-Id: I2388eaf9edb0f25a4518c3b7d857404a2307189a
This commit is contained in:
Steven Moreland 2017-11-13 21:18:20 +00:00 committed by android-build-merger
commit c0a49f8784
1 changed files with 2 additions and 6 deletions

View File

@ -78,9 +78,7 @@ 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)
ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true)
ifdef BUILT_VENDOR_MATRIX
$(GEN): $(BUILT_VENDOR_MATRIX)
$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)"
@ -105,9 +103,7 @@ 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)
ifeq ($(PRODUCT_ENFORCE_VINTF_MANIFEST),true)
ifdef BUILT_VENDOR_MANIFEST
$(GEN): $(BUILT_VENDOR_MANIFEST)
$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)"