From 5420780e92aaebfdcdfae69965edfe0ba2c5e46d Mon Sep 17 00:00:00 2001 From: Konsta Date: Sat, 29 Mar 2025 10:45:16 +0200 Subject: [PATCH] bump shipping api level * HIDL services are not included on API level 35. Add the services since we're still using few HIDL HALs. https://android.googlesource.com/device/google/cuttlefish/+/4ce8327a8f450236f742f697d502c653848b10b5 * FCM level can't be bumped to 202404 until all HALs have been updated to AIDL i.e. at least following HALs reported by 'make check-vintf-all'. All HALs in device manifest are declared in FCM <= level 202404 ERROR: files are incompatible: ... android.hardware.camera.provider@2.5::ICameraProvider/legacy/0 is deprecated in compatibility matrix at FCM Version 202404; it should not be served. because it matches android.hardware.camera.provider@2.4::ICameraProvider/[^/]+/[0-9]+ from /system/etc/vintf/compatibility_matrix.7.xml android.hardware.audio@7.1::IDevicesFactory/default is deprecated in compatibility matrix at FCM Version 202404; it should not be served. because it matches android.hardware.audio@7.0::IDevicesFactory/default from /system/etc/vintf/compatibility_matrix.8.xml android.hardware.audio.effect@7.0::IEffectsFactory/default is deprecated in compatibility matrix at FCM Version 202404; it should not be served. because it matches android.hardware.audio.effect@7.0::IEffectsFactory/default from /system/etc/vintf/compatibility_matrix.8.xml: Success INCOMPATIBLE --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 6b3b8c9..f08285d 100644 --- a/device.mk +++ b/device.mk @@ -15,7 +15,7 @@ $(call inherit-product, vendor/brcm/rpi4/rpi4-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) # API level -PRODUCT_SHIPPING_API_LEVEL := 34 +PRODUCT_SHIPPING_API_LEVEL := 35 # Audio PRODUCT_PACKAGES += \ @@ -201,6 +201,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.hardware.health.rpi4 +# HIDL +PRODUCT_PACKAGES += \ + android.hidl.allocator@1.0-service \ + hwservicemanager + # Kernel PRODUCT_COPY_FILES += \ $(DEVICE_PATH)-kernel/Image:$(PRODUCT_OUT)/kernel