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

Commit 95884380 authored by Steven Moreland's avatar Steven Moreland
Browse files

Use PRODUCT_ENFORCE_VINTF_MANIFEST. 

PRODUCT_FULL_TREBLE is being split up into smaller,
more manageable flags.

Bug: 62019611
Test: manual
Change-Id: I046f9eb4099cf441842f3d0e6908d99df063c27e
parent 44cb0db6

target/board/Android.mk

+2 −6
Original line number Diff line number Diff line
@@ -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)"