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

Commit 19a81f4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "doc: DEVICE_*_MATRIX_FILE specifies absolute paths" am: cc627931 am:... 

Merge "doc: DEVICE_*_MATRIX_FILE specifies absolute paths" am: cc627931 am: 4e7d50fe am: dfb4a153 am: 7bafc1ab

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

Change-Id: I8a22058e25999bf6617d50314a1f61f817b656e1
parents 28833592 7bafc1ab

compatibility_matrices/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifndef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE 
LOCAL_SRC_FILES := compatibility_matrix.empty.xml

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)



# 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_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)



# Enforce that DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE does not specify required HALs