From f98ea3001c95c93b098d2ad89bfbc9ba70da44ee Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Tue, 30 Mar 2021 15:50:01 -0700
Subject: [PATCH] Uses Android.bp vintf_compatibility_matrix for redfin product
 FCM.

This change also includes the following FCM cleanups:
- Adds level="6", specifying that this product FCM is compatible with an
  S vendor image. This is similar to the framework FCM.
- Marks the HAL as required. This is possible now that the redfin_vf
  target includes an additional product FCM specific to level="5" (R).

Bug: 183507590
Test: m redfin
Test: m redfin_vf, merge with R vendor half
Change-Id: I1b9bbd9b4a723d2479023d1025ef22905e1bc9a1
---
 Android.bp                          | 9 +++++++++
 device-redfin.mk                    | 3 +++
 device_framework_matrix_product.xml | 4 ++--
 redfin/BoardConfig.mk               | 1 -
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index cdb25af..161e0e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,3 +33,12 @@ license {
     ],
     // large-scale-change unable to identify any license_text files
 }
+
+vintf_compatibility_matrix {
+    name: "redfin_product_compatibility_matrix.xml",
+    stem: "compatibility_matrix.redfin.xml",
+    product_specific: true,
+    srcs: [
+        "device_framework_matrix_product.xml",
+    ],
+}
diff --git a/device-redfin.mk b/device-redfin.mk
index 27f0f20..69e6f88 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -237,3 +237,6 @@ PRODUCT_PACKAGES += \
 # (b/183612348): Enable skia reduceOpsTaskSplitting
 PRODUCT_PROPERTY_OVERRIDES += \
     renderthread.skia.reduceopstasksplitting=true
+
+# Include the redfin product FCM
+PRODUCT_PACKAGES += redfin_product_compatibility_matrix.xml
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 69b2d80..742d1ff 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,5 +1,5 @@
-<compatibility-matrix version="1.0" type="framework">
-    <hal format="hidl" optional="true">
+<compatibility-matrix version="1.0" type="framework" level="6">
+    <hal format="hidl" optional="false">
         <name>vendor.google.wireless_charger</name>
         <version>1.3</version>
         <interface>
diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk
index f64f492..d155f40 100644
--- a/redfin/BoardConfig.mk
+++ b/redfin/BoardConfig.mk
@@ -23,7 +23,6 @@ else
   USES_DEVICE_GOOGLE_REDFIN := true
 
   include device/google/redbull/BoardConfig-common.mk
-  DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/redfin/device_framework_matrix_product.xml
 
   # Testing related defines
   #BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r3-setup.sh