| commit | 6ea689eb1a54b264c78321bd64d1606bcff30644 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 29 23:18:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 29 23:18:49 2022 +0000 |
| tree | 346a0d71097e54a1789a83757e4ab153f51fa10e | |
| parent | e11b15012e3e0582bc03e160e1ba68f9b37a586b [diff] | |
| parent | 5ca6f2a379abd9d8b0155ba7e6f6bdb158a684a9 [diff] |
Merge "Revert "Disable current matrix."" into tm-dev-plus-aosp am: 5ca6f2a379 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18092493 Change-Id: I159481900c0f82b592c0fc2f6d2d2d0cdbba0f21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 422b37e..524242f 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp
@@ -87,7 +87,6 @@ vintf_compatibility_matrix { name: "framework_compatibility_matrix.current.xml", - enabled: false, stem: "compatibility_matrix.current.xml", srcs: [ "compatibility_matrix.current.xml",
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index d6a44d0..d19f0da 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk
@@ -103,6 +103,7 @@ framework_compatibility_matrix.5.xml \ framework_compatibility_matrix.6.xml \ framework_compatibility_matrix.7.xml \ + framework_compatibility_matrix.current.xml \ framework_compatibility_matrix.device.xml \ my_framework_matrix_deps += \