From 49a6654ccf5675470b5f638a918a963cc446ee36 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 4 May 2017 14:30:59 -0700
Subject: [PATCH] Set omx and configstore as optional.

To fix the build for new devices.

Bug: 36097717
Bug: 35356977

Test: on master, m system_compatibility_matrix.xml -j

Change-Id: Ie7a3da46930b3627f4eb6b77c3ba8e50fa2b21ed
---
 compatibility_matrix.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index c643fc7a..8ef91b9d 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -23,7 +23,8 @@
         <name>android.hardware.camera.provider</name>
         <version>2.4</version>
     </hal>
-    <hal format="hidl" optional="false">
+    <!-- TODO(b/35356977): configstore is required. -->
+    <hal format="hidl" optional="true">
         <name>android.hardware.configstore</name>
         <version>1.0-1</version>
     </hal>
@@ -71,7 +72,8 @@
         <name>android.hardware.light</name>
         <version>2.0</version>
     </hal>
-    <hal format="hidl" optional="false">
+    <!-- TODO(b/36097717): omx is required. -->
+    <hal format="hidl" optional="true">
         <name>android.hardware.media.omx</name>
         <version>1.0</version>
     </hal>
-- 
2.11.0