From 96f878f4ee64b5dac5cb20f087906cf757f10b9e Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 21 May 2021 18:19:36 +0000 Subject: [PATCH] Revert "Disable current matrix." This reverts commit e0bb84be37c5acc8ff84ad657242eca075a75726. Reason for revert: needs to be reverted in sc-dev-plus-aosp and below to re-enable the T matrix on aosp/master-..->goog/master Change-Id: I538533d21e624f8ee5a392d0ee7618ee0969ec87 Merged-In: I4525301ad1205cf41937a98b7b9f67f052cb5bd9 --- compatibility_matrices/Android.bp | 1 - compatibility_matrices/Android.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp index 31fa1ae403..da55347d25 100644 --- a/compatibility_matrices/Android.bp +++ b/compatibility_matrices/Android.bp @@ -75,7 +75,6 @@ vintf_compatibility_matrix { 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 4cefb5506e..9e715bf37d 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -102,6 +102,7 @@ my_system_matrix_deps := \ 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 += \