From 7202c60c3aee27f8e51f9dc46c3e13613602ce9f Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 6 Jul 2023 10:08:24 +0000 Subject: [PATCH] Revert "Only allow cuttlefish to use FCM 9 HALs" Revert submission 2649121-cm_vintf_workaround Reason for revert: b/290154726 Reverted changes: /q/submissionid:2649121-cm_vintf_workaround Change-Id: Ied04c3892a4a00ef75f92e1f89ba38cada2f8293 --- compatibility_matrices/Android.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index ed49c99431..a82a421ff4 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -103,16 +103,8 @@ my_system_matrix_deps := \ framework_compatibility_matrix.6.xml \ framework_compatibility_matrix.7.xml \ framework_compatibility_matrix.8.xml \ - framework_compatibility_matrix.device.xml \ - -# Allow only cuttlefish to continue using matrix 9 HALs -# TODO(b/290060286) This is a temporary workaround for trunk stable and -# should be removed once interface versions can be flagged properly. -ifneq (,$(filter device/google/cuttlefish/shared/config/manifest.xml, $(DEVICE_MANIFEST_FILE))) -my_system_matrix_deps += \ framework_compatibility_matrix.9.xml \ - -endif + framework_compatibility_matrix.device.xml \ my_framework_matrix_deps += \ $(my_system_matrix_deps)