diff --git a/compatibility_matrix_202404.xml b/compatibility_matrix_202404.xml
new file mode 100644
index 0000000..6e4ca99
--- /dev/null
+++ b/compatibility_matrix_202404.xml
@@ -0,0 +1,76 @@
+
+
+
+ android.frameworks.displayservice
+ 1.0
+
+ IDisplayService
+ default
+
+
+
+ android.frameworks.schedulerservice
+ 1.0
+
+ ISchedulingPolicyService
+ default
+
+
+
+ android.frameworks.sensorservice
+ 1.0
+
+ ISensorManager
+ default
+
+
+
+ android.hardware.graphics.composer
+ 2.1
+
+ IComposer
+ vr
+
+
+
+ android.hidl.manager
+ 1.0
+
+ IServiceManager
+ default
+
+
+
+ android.hidl.memory
+ 1.0
+
+ IMapper
+ ashmem
+
+
+
+ android.hidl.token
+ 1.0
+
+ ITokenManager
+ default
+
+
+
+ android.system.wifi.keystore
+ 1.0
+
+ IKeystore
+ default
+
+
+
+ 0.0.0
+
+
diff --git a/device.mk b/device.mk
index 9638ef2..5280332 100644
--- a/device.mk
+++ b/device.mk
@@ -410,13 +410,33 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
# Device Manifest, Device Compatibility Matrix for Treble
+#
+# Install product specific framework compatibility matrix
+# (TODO: b/169535506) This includes the FCM for system_ext and product partition.
+# It must be split into the FCM of each partition.
+ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35)
+DEVICE_MANIFEST_FILE := \
+ device/google/zumapro/manifest_202404.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product_202404.xml
+DEVICE_MATRIX_FILE := \
+ device/google/zumapro/compatibility_matrix_202404.xml
+else
DEVICE_MANIFEST_FILE := \
device/google/zumapro/manifest.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product_8.xml
+DEVICE_MATRIX_FILE := \
+ device/google/zumapro/compatibility_matrix.xml
+endif
BOARD_USE_CODEC2_AIDL := V1
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35)
+DEVICE_MANIFEST_FILE += \
+ device/google/zumapro/manifest_media_aosp_202404.xml
+else
DEVICE_MANIFEST_FILE += \
device/google/zumapro/manifest_media_aosp.xml
+endif
PRODUCT_COPY_FILES += \
device/google/zumapro/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml
@@ -429,9 +449,6 @@ PRODUCT_COPY_FILES += \
device/google/zumapro/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_aosp_c2.xml
endif
-DEVICE_MATRIX_FILE := \
- device/google/zumapro/compatibility_matrix.xml
-
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
# RKP VINTF
@@ -1245,11 +1262,6 @@ include hardware/google/pixel/wifi_ext/device.mk
# Battery Stats Viewer
PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
-# Install product specific framework compatibility matrix
-# (TODO: b/169535506) This includes the FCM for system_ext and product partition.
-# It must be split into the FCM of each partition.
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml
-
# Keymint configuration
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
diff --git a/device_framework_matrix_product_202404.xml b/device_framework_matrix_product_202404.xml
new file mode 100644
index 0000000..ce5db47
--- /dev/null
+++ b/device_framework_matrix_product_202404.xml
@@ -0,0 +1,198 @@
+
+
+ android.hardware.boot
+ IBootControl/default
+
+
+ android.hardware.graphics.composer3
+ 2
+
+ IComposer
+ default
+
+
+
+ android.hardware.radio
+ 1.2
+
+ ISap
+ slot2
+
+
+
+ android.hardware.vibrator
+ 2
+
+ IVibrator
+ dual
+
+
+
+ android.hardware.wifi.hostapd
+ 1
+
+ IHostapd
+ default
+
+
+
+ android.vendor.samsung_slsi.telephony.hardware.radio
+ 1.1
+
+ IOemSamsungslsi
+ slot1
+ slot2
+
+
+
+ com.fingerprints33.extension
+ 1.0
+
+ IFingerprintAuthenticator
+ default
+
+
+ IFingerprintCalibration
+ default
+
+
+ IFingerprintEngineering
+ default
+
+
+ IFingerprintNavigation
+ default
+
+
+ IFingerprintRecalibration
+ default
+
+
+ IFingerprintSenseTouch
+ default
+
+
+ IFingerprintSensorTest
+ default
+
+
+
+ com.google.face.debug
+ 3-4
+
+ IDebugHost
+ default
+
+
+ IDebugManager
+ default
+
+
+
+ com.google.edgetpu
+ 2
+
+ IEdgeTpuVendorService
+ default
+
+
+
+ com.google.edgetpu.dba
+ 1
+
+ IDevice
+ default
+
+
+
+ com.google.edgetpu.tachyon
+ 1
+
+ IComputeService
+ default
+
+
+
+ com.google.hardware.pixel.display
+ 13
+
+ IDisplay
+ default
+
+
+
+ hardware.qorvo.uwb
+
+ IUwbVendor
+ default
+
+
+
+ vendor.goodix.hardware.biometrics.fingerprint
+ 2.1
+
+ IGoodixFingerprintDaemon
+ default
+
+
+
+ vendor.google.google_battery
+ 2-3
+
+ IGoogleBattery
+ default
+
+
+
+ vendor.google.wifi_ext
+ 2-4
+
+ IWifiExt
+ default
+
+
+
+ vendor.samsung_slsi.telephony.hardware.oemservice
+ 1.0
+
+ IOemService
+ dm0
+ dm1
+ sced0
+
+
+
+ com.google.pixel.modem.logmasklibrary
+ 1
+
+ ILiboemserviceProxy
+ default
+
+
+
+ vendor.samsung_slsi.telephony.hardware.radioExternal
+ 1.1
+
+ IOemSlsiRadioExternal
+ rilExternal
+
+
+
+ vendor.samsung_slsi.telephony.hardware.radioExternal
+ 1
+
+ IOemSlsiRadioExternal
+ default
+
+
+
+ vendor.samsung_slsi.telephony.hardware.oemservice
+ 1
+
+ IOemService
+ dm0
+ dm1
+ sced0
+
+
+
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product_8.xml
similarity index 100%
rename from device_framework_matrix_product.xml
rename to device_framework_matrix_product_8.xml
diff --git a/manifest_202404.xml b/manifest_202404.xml
new file mode 100644
index 0000000..f1ed5b9
--- /dev/null
+++ b/manifest_202404.xml
@@ -0,0 +1,6 @@
+
+
+ android.hardware.boot
+ IBootControl/default
+
+
diff --git a/manifest_media_aosp_202404.xml b/manifest_media_aosp_202404.xml
new file mode 100644
index 0000000..57f073f
--- /dev/null
+++ b/manifest_media_aosp_202404.xml
@@ -0,0 +1,8 @@
+
+
+
+ android.hardware.media.c2
+ 1
+ IComponentStore/default
+
+