Merge "Fix emu builds"
diff --git a/common/car.mk b/common/car.mk
index cbcf55a..07a269f 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -97,3 +97,6 @@
endif
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+
+# TODO(b/253459812): find a better way to handle it.
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/generic/car/common/device_framework_matrix_product.xml
\ No newline at end of file
diff --git a/common/device_framework_matrix_product.xml b/common/device_framework_matrix_product.xml
new file mode 100644
index 0000000..a761974
--- /dev/null
+++ b/common/device_framework_matrix_product.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework" level="8">
+ <hal format="aidl" optional="true">
+ <name>device.generic.car.emulator</name>
+ <version>1</version>
+ <interface>
+ <name>IVehicleBus</name>
+ <instance>protocanbus</instance>
+ </interface>
+ </hal>
+</compatibility-matrix>