Only allow cuttlefish to use FCM 9 HALs am: 92aebeae51 am: e3395a7486 am: eece383041 am: a7b0ffb678 am: 092d326d46 am: d9a5aee210
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2647305
Change-Id: Idd059198b16f6ba0bcd728bb2bb0adb244ffbe12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index a82a421..ed49c99 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -103,9 +103,17 @@
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)