commit 6777f8aedec171d0a391bcd1367a47c5a402f8ee
author Yifan Hong <elsk@google.com> Tue Oct 20 19:28:34 2020 +0000
committer Yifan Hong <elsk@google.com> Tue Oct 20 19:28:34 2020 +0000
tree c65c240eb6241cb54b09eaf2c60a169d1d9ffa18
parent 540dc2771adfcf69da51b8933bc7cc3b2c73eefd

Reland "Remove legacy/O/O-MR1 matrices."

This reverts commit 540dc2771adfcf69da51b8933bc7cc3b2c73eefd.

Reason for revert: reland because target-level 2 are fixed

Bug: 163419744
Change-Id: I293852d50de9a4eeaeec6ccf4c0290f1c1b0012d

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 0eff450..849df94 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -60,6 +60,18 @@
             // does not depend on this HAL, hence it is not declared in any manifests or matrices.
             "android.hardware.fastboot@1.0",
             "android.hardware.fastboot@1.1",
+
+            // Deprecated HALs.
+            // HIDL
+            // TODO(b/171260360) Remove when HAL definition is removed
+            "android.hardware.audio.effect@2.0",
+            "android.hardware.audio@2.0",
+            // TODO(b/171260613) Remove when HAL definition is removed
+            "android.hardware.health@1.0",
+            // TODO(b/171260670) Remove when HAL definition is removed
+            "android.hardware.nfc@1.0",
+            // TODO(b/171260715) Remove when HAL definition is removed
+            "android.hardware.radio.deprecated@1.0",
     };
 
     auto package_has_prefix = [&](const std::string& prefix) {