Merge "doc: DEVICE_*_MATRIX_FILE specifies absolute paths" am: cc6279316f am: 4e7d50fe01

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1455056

Change-Id: I23e89462b639cf28d7af43a80a77ddfc31b0f820
This commit is contained in:
Treehugger Robot
2020-10-08 22:45:59 +00:00
committed by Automerger Merge Worker

View File

@@ -33,7 +33,7 @@ ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE
LOCAL_SRC_FILES := compatibility_matrix.empty.xml LOCAL_SRC_FILES := compatibility_matrix.empty.xml
else else
# DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE specify an absolute path # DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE specifies absolute paths
LOCAL_GENERATED_SOURCES := $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE) LOCAL_GENERATED_SOURCES := $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE)
# Enforce that DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE does not specify required HALs # Enforce that DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE does not specify required HALs
@@ -77,7 +77,7 @@ LOCAL_PRODUCT_MODULE := true
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_RELATIVE_PATH := vintf LOCAL_MODULE_RELATIVE_PATH := vintf
# DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE specify an absolute path # DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE specifies absolute paths
LOCAL_GENERATED_SOURCES := $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE) LOCAL_GENERATED_SOURCES := $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE)
# Enforce that DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE does not specify required HALs # Enforce that DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE does not specify required HALs