Merge "Only checks compatibility for VINTF XMLs when PRODUCT_FULL_TREBLE" into oc-dev
This commit is contained in:
commit
e3dc10aba7
1 changed files with 10 additions and 0 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue