commit b5bb158d207ae304e4d9a47a3d272cb47f1918ae
author Steven Moreland <smoreland@google.com> Thu Apr 28 23:04:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 28 23:04:33 2022 +0000
tree 5f6e90b4acd7b97ca2fe4dfba03252cbe6c11bbc
parent 58178fd1b7c24282aec85f09164ad58b461938bb
parent e7938a23bbf538037fd7d850905f77137909218f

Merge "DO NOT MERGE: Disable current matrix." into tm-dev

compatibility_matrices/Android.bp

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 524242f..422b37e 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -87,6 +87,7 @@
 
 vintf_compatibility_matrix {
     name: "framework_compatibility_matrix.current.xml",
+    enabled: false,
     stem: "compatibility_matrix.current.xml",
     srcs: [
         "compatibility_matrix.current.xml",

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index d19f0da..d6a44d0 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -103,7 +103,6 @@
     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 += \