Add manifest for VINTF target FCM level 202404

device_framework_matrix_product_202404.xml,
manifest_202404.xml:
  target-level = 202404

compatibility_matrix_202404.xml:
  remove "android.hidl.allocator@1.0" per b/205764958

manifest_media_aosp_202404.xml:
  remove codec2 hidl fragments

Flag: EXEMPT NDK
Bug: 312876454
Change-Id: Ic6b867cb55a184803ae41f1b58a4ecc0269c4b87
This commit is contained in:
Cyan Hsieh 2024-06-25 07:59:24 +00:00 committed by chenkris
parent 0c1aa1be86
commit cee21e461f
6 changed files with 308 additions and 8 deletions

View file

@ -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 \