Switch camera and minigbm gralloc to apex, same as upstream

This commit is contained in:
oxmc
2025-11-02 21:15:12 -08:00
parent f8f488cbd8
commit 846cac1b51
11 changed files with 80 additions and 37 deletions

View File

@@ -52,21 +52,21 @@ PRODUCT_COPY_FILES += \
# Camera
PRODUCT_PACKAGES += \
android.hardware.camera.provider-V1-external-service
com.android.hardware.camera.external.rpi4
PRODUCT_COPY_FILES += \
$(DEVICE_PATH)/camera/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml
$(DEVICE_PATH)/camera/external/external_camera_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/external_camera_config.xml
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.camera.external.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.external.xml
PRODUCT_PACKAGES += \
android.hardware.camera.provider-V1-libcamera-service \
camera.libcamera \
ipa_rpi_vc4
com.android.hardware.camera.libcamera
$(call soong_config_set,libcamera,ipa,vc4)
PRODUCT_COPY_FILES += \
$(DEVICE_PATH)/camera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml
$(DEVICE_PATH)/camera/libcamera/camera_hal.yaml:$(TARGET_COPY_OUT_VENDOR)/etc/libcamera/camera_hal.yaml
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \
@@ -116,8 +116,7 @@ PRODUCT_PACKAGES += \
# Graphics
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator-service.minigbm_gbm_mesa \
mapper.minigbm_gbm_mesa
com.android.hardware.graphics.allocator.minigbm_gbm_mesa
PRODUCT_PACKAGES += \
com.android.hardware.graphics.composer.drm_hwcomposer
@@ -128,10 +127,6 @@ PRODUCT_PACKAGES += \
libGLESv2_mesa \
libgallium_dri
PRODUCT_PACKAGES += \
dri_gbm \
libgbm_mesa
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml