Add manifest for VINTF target FCM level 202404

Target FCM level 202404 deprecated the following HALs:
    android.hardware.graphics.mapper
Target FCM level 202404 requires the newer version of the following HALs:
    android.hardware.radio.config
    android.hardware.radio.data
    android.hardware.radio.messaging
    android.hardware.radio.modem
    android.hardware.radio.network
    android.hardware.radio.sim
    android.hardware.radio.voice
Add the previous version of these HALs into the customized product FCM
before ready to remove them from device manifest

Bug: 312876454
Flag: EXEMPT NDK
Change-Id: Ic9af791e7aa2027bf8d7ff9c39cf097323d7b68a
This commit is contained in:
Cyan_Hsieh 2024-05-21 18:20:12 +08:00
parent f1366bab96
commit 248f353887
3 changed files with 290 additions and 5 deletions

View file

@ -398,8 +398,19 @@ 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
else
DEVICE_MANIFEST_FILE := \
device/google/zumapro/manifest.xml
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/zumapro/device_framework_matrix_product.xml
endif
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
DEVICE_MANIFEST_FILE += \
@ -1186,11 +1197,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 \

View file

@ -0,0 +1,264 @@
<compatibility-matrix version="1.0" type="framework" level="202404">
<hal format="aidl" optional="true">
<name>android.hardware.boot</name>
<fqname>IBootControl/default</fqname>
</hal>
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
<version>2</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.graphics.mapper</name>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio</name>
<version>1.2</version>
<interface>
<name>ISap</name>
<instance>slot2</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.config</name>
<version>2</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.data</name>
<version>2</version>
<interface>
<name>IRadioData</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.messaging</name>
<version>2</version>
<interface>
<name>IRadioMessaging</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.modem</name>
<version>2</version>
<interface>
<name>IRadioModem</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.network</name>
<version>2</version>
<interface>
<name>IRadioNetwork</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.sim</name>
<version>2</version>
<interface>
<name>IRadioSim</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.radio.voice</name>
<version>2</version>
<interface>
<name>IRadioVoice</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.vibrator</name>
<version>2</version>
<interface>
<name>IVibrator</name>
<instance>dual</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.wifi.hostapd</name>
<version>1</version>
<interface>
<name>IHostapd</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.vendor.samsung_slsi.telephony.hardware.radio</name>
<version>1.1</version>
<interface>
<name>IOemSamsungslsi</name>
<instance>slot1</instance>
<instance>slot2</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>com.fingerprints33.extension</name>
<version>1.0</version>
<interface>
<name>IFingerprintAuthenticator</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintCalibration</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintEngineering</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintNavigation</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintRecalibration</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintSenseTouch</name>
<instance>default</instance>
</interface>
<interface>
<name>IFingerprintSensorTest</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true" updatable-via-apex="true">
<name>com.google.face.debug</name>
<version>3-4</version>
<interface>
<name>IDebugHost</name>
<instance>default</instance>
</interface>
<interface>
<name>IDebugManager</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>com.google.edgetpu</name>
<version>2</version>
<interface>
<name>IEdgeTpuVendorService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>com.google.edgetpu.dba</name>
<version>1</version>
<interface>
<name>IDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>com.google.edgetpu.tachyon</name>
<version>1</version>
<interface>
<name>IComputeService</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name>
<version>12</version>
<interface>
<name>IDisplay</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>hardware.qorvo.uwb</name>
<interface>
<name>IUwbVendor</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.goodix.hardware.biometrics.fingerprint</name>
<version>2.1</version>
<interface>
<name>IGoodixFingerprintDaemon</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.google_battery</name>
<version>2-3</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.google.radioext</name>
<version>1.7</version>
<interface>
<name>IRadioExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
<version>2-3</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.samsung_slsi.telephony.hardware.oemservice</name>
<version>1.0</version>
<interface>
<name>IOemService</name>
<instance>dm0</instance>
<instance>dm1</instance>
<instance>sced0</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>com.google.pixel.modem.logmasklibrary</name>
<version>1</version>
<interface>
<name>ILiboemserviceProxy</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
<version>1.1</version>
<interface>
<name>IOemSlsiRadioExternal</name>
<instance>rilExternal</instance>
</interface>
</hal>
</compatibility-matrix>

15
manifest_202404.xml Normal file
View file

@ -0,0 +1,15 @@
<manifest version="1.0" type="device" target-level="202404">
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.boot</name>
<fqname>IBootControl/default</fqname>
</hal>
</manifest>