| commit | b91c1c48f439dd527f489fc99a9a77c08d4c5cb7 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri May 21 17:50:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 17:50:42 2021 +0000 |
| tree | ebfc379d3d1e0a02ead0c69070b38d61ec5290d6 | |
| parent | fc94d7c4e9dc44c84519bb0fb6ae39a36f42616f [diff] | |
| parent | d02d9f2767d291e601a1f7a57d71c411fd9788ed [diff] |
Merge changes I5716db7c,Id83986fc into sc-dev am: d02d9f2767 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14671107 Change-Id: I40668d021a41cdbc743517ca54bbd0889ecbbd8f
diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 31fa1ae..da55347 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp
@@ -75,7 +75,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 4cefb55..9e715bf 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk
@@ -102,6 +102,7 @@ framework_compatibility_matrix.4.xml \ framework_compatibility_matrix.5.xml \ framework_compatibility_matrix.6.xml \ + framework_compatibility_matrix.current.xml \ framework_compatibility_matrix.device.xml \ my_framework_matrix_deps += \