Merge "Add manifest for VINTF target FCM level 202404" into main
This commit is contained in:
Cyan Hsieh
Android (Google) Code Review
commit
36ea89ca92
6 changed files with 308 additions and 8 deletions
76
compatibility_matrix_202404.xml
Normal file
76
compatibility_matrix_202404.xml
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
<!--
|
||||||
|
Autogenerated skeleton compatibility matrix.
|
||||||
|
Use with caution. Modify it to suit your needs.
|
||||||
|
All HALs are set to optional.
|
||||||
|
Many entries other than HALs are zero-filled and
|
||||||
|
require human attention.
|
||||||
|
-->
|
||||||
|
<compatibility-matrix version="1.0" type="device">
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.frameworks.displayservice</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IDisplayService</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.frameworks.schedulerservice</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>ISchedulingPolicyService</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.frameworks.sensorservice</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>ISensorManager</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.hardware.graphics.composer</name>
|
||||||
|
<version>2.1</version>
|
||||||
|
<interface>
|
||||||
|
<name>IComposer</name>
|
||||||
|
<instance>vr</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.hidl.manager</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IServiceManager</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.hidl.memory</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IMapper</name>
|
||||||
|
<instance>ashmem</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.hidl.token</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>ITokenManager</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="hidl" optional="true">
|
||||||
|
<name>android.system.wifi.keystore</name>
|
||||||
|
<version>1.0</version>
|
||||||
|
<interface>
|
||||||
|
<name>IKeystore</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<vndk>
|
||||||
|
<version>0.0.0</version>
|
||||||
|
</vndk>
|
||||||
|
</compatibility-matrix>
|
||||||
28
device.mk
28
device.mk
|
|
@ -410,13 +410,33 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||||
PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
|
PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
|
||||||
|
|
||||||
# Device Manifest, Device Compatibility Matrix for Treble
|
# 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_MANIFEST_FILE := \
|
||||||
device/google/zumapro/manifest.xml
|
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
|
BOARD_USE_CODEC2_AIDL := V1
|
||||||
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
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_MANIFEST_FILE += \
|
||||||
device/google/zumapro/manifest_media_aosp.xml
|
device/google/zumapro/manifest_media_aosp.xml
|
||||||
|
endif
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/zumapro/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml
|
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
|
device/google/zumapro/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_aosp_c2.xml
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DEVICE_MATRIX_FILE := \
|
|
||||||
device/google/zumapro/compatibility_matrix.xml
|
|
||||||
|
|
||||||
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
|
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
|
||||||
|
|
||||||
# RKP VINTF
|
# RKP VINTF
|
||||||
|
|
@ -1245,11 +1262,6 @@ include hardware/google/pixel/wifi_ext/device.mk
|
||||||
# Battery Stats Viewer
|
# Battery Stats Viewer
|
||||||
PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
|
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
|
# Keymint configuration
|
||||||
PRODUCT_COPY_FILES += \
|
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 \
|
frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
|
||||||
|
|
|
||||||
198
device_framework_matrix_product_202404.xml
Normal file
198
device_framework_matrix_product_202404.xml
Normal file
|
|
@ -0,0 +1,198 @@
|
||||||
|
<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.radio</name>
|
||||||
|
<version>1.2</version>
|
||||||
|
<interface>
|
||||||
|
<name>ISap</name>
|
||||||
|
<instance>slot2</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>13</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="aidl" optional="true">
|
||||||
|
<name>vendor.google.wifi_ext</name>
|
||||||
|
<version>2-4</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>
|
||||||
|
<hal format="aidl" optional="true">
|
||||||
|
<name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
|
||||||
|
<version>1</version>
|
||||||
|
<interface>
|
||||||
|
<name>IOemSlsiRadioExternal</name>
|
||||||
|
<instance>default</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
<hal format="aidl" optional="true">
|
||||||
|
<name>vendor.samsung_slsi.telephony.hardware.oemservice</name>
|
||||||
|
<version>1</version>
|
||||||
|
<interface>
|
||||||
|
<name>IOemService</name>
|
||||||
|
<instance>dm0</instance>
|
||||||
|
<instance>dm1</instance>
|
||||||
|
<instance>sced0</instance>
|
||||||
|
</interface>
|
||||||
|
</hal>
|
||||||
|
</compatibility-matrix>
|
||||||
6
manifest_202404.xml
Normal file
6
manifest_202404.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<manifest version="1.0" type="device" target-level="202404">
|
||||||
|
<hal format="aidl">
|
||||||
|
<name>android.hardware.boot</name>
|
||||||
|
<fqname>IBootControl/default</fqname>
|
||||||
|
</hal>
|
||||||
|
</manifest>
|
||||||
8
manifest_media_aosp_202404.xml
Normal file
8
manifest_media_aosp_202404.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
<manifest version="1.0" type="device">
|
||||||
|
<!-- AIDL fragment -->
|
||||||
|
<hal format="aidl">
|
||||||
|
<name>android.hardware.media.c2</name>
|
||||||
|
<version>1</version>
|
||||||
|
<fqname>IComponentStore/default</fqname>
|
||||||
|
</hal>
|
||||||
|
</manifest>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue