From 92aebeae51450cbb2197dce9d910713dd0069880 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Fri, 30 Jun 2023 22:40:08 +0000 Subject: [PATCH] Only allow cuttlefish to use FCM 9 HALs In preperation for trunk stable, we need to limit all current devices to using only frozen interfaces. Test: m Bug: none Change-Id: Ifdb8bbd79fc651cb62836b6876aa39a94187a546 --- compatibility_matrices/Android.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index a82a421ff4..ed49c99431 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -103,9 +103,17 @@ my_system_matrix_deps := \ framework_compatibility_matrix.6.xml \ framework_compatibility_matrix.7.xml \ framework_compatibility_matrix.8.xml \ - framework_compatibility_matrix.9.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 + my_framework_matrix_deps += \ $(my_system_matrix_deps)