From d4f0c1879d95624e52391f8060cac3e3b8172bd2 Mon Sep 17 00:00:00 2001 From: Ziyang Zhou Date: Wed, 4 May 2022 16:03:29 +0800 Subject: [PATCH] change to use prebuilts --- gpu_config.sh | 4 ++-- redroid.mk | 8 +------- redroid_arm64/BoardConfig.mk | 4 ---- redroid_arm64/device.mk | 7 +++---- redroid_arm64_only/BoardConfig.mk | 4 ---- redroid_arm64_only/device.mk | 7 +++---- redroid_x86_64/BoardConfig.mk | 4 ---- redroid_x86_64/device.mk | 5 +++-- redroid_x86_64_only/BoardConfig.mk | 4 ---- redroid_x86_64_only/device.mk | 5 +++-- 10 files changed, 15 insertions(+), 37 deletions(-) diff --git a/gpu_config.sh b/gpu_config.sh index 46c32ca..7be0db5 100755 --- a/gpu_config.sh +++ b/gpu_config.sh @@ -16,7 +16,7 @@ setup_vulkan() { v3d|vc4) setprop ro.hardware.vulkan broadcom ;; - msm) + msm_drm) setprop ro.hardware.vulkan freedreno ;; panfrost) @@ -50,7 +50,7 @@ setup_render_node() { echo "DRI node exists, driver: $driver" setup_vulkan $driver case $driver in - i915|amdgpu|virtio_gpu|v3d|vc4|msm|panfrost) + i915|amdgpu|virtio_gpu|v3d|vc4|msm_drm|panfrost) node="/dev/dri/renderD$d" echo "use render node: $node" setprop gralloc.gbm.device $node diff --git a/redroid.mk b/redroid.mk index 2522892..5cac1e5 100644 --- a/redroid.mk +++ b/redroid.mk @@ -61,13 +61,6 @@ PRODUCT_PACKAGES += \ libGLESv1_CM_angle \ libGLESv2_angle \ vulkan.pastel \ - libEGL_mesa \ - libGLESv1_CM_mesa \ - libGLESv2_mesa \ - libgallium_dri \ - libglapi \ - vulkan.radeon \ - vulkan.virtio \ ipconfigstore \ vncserver \ @@ -155,3 +148,4 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) $(call inherit-product-if-exists, product.mk) +$(call inherit-product, device/redroid-prebuilts/prebuilts.mk) diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk index 9a5187d..de0f1ea 100644 --- a/redroid_arm64/BoardConfig.mk +++ b/redroid_arm64/BoardConfig.mk @@ -18,9 +18,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216 -BOARD_MESA3D_USES_MESON_BUILD := true -BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi v3d vc4 freedreno panfrost -BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd broadcom freedreno panfrost - DEVICE_MANIFEST_FILE += device/redroid/manifest.xml diff --git a/redroid_arm64/device.mk b/redroid_arm64/device.mk index aacfc82..aac7ddb 100644 --- a/redroid_arm64/device.mk +++ b/redroid_arm64/device.mk @@ -1,5 +1,4 @@ -PRODUCT_PACKAGES += \ - vulkan.broadcom \ - vulkan.freedreno \ - vulkan.panfrost \ +PRODUCT_COPY_FILES += \ + device/redroid/mediacodec.policy.arm:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ +$(call inherit-product, device/redroid-prebuilts/prebuilts_arm.mk) diff --git a/redroid_arm64_only/BoardConfig.mk b/redroid_arm64_only/BoardConfig.mk index ff83dad..21257a9 100644 --- a/redroid_arm64_only/BoardConfig.mk +++ b/redroid_arm64_only/BoardConfig.mk @@ -12,9 +12,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216 -BOARD_MESA3D_USES_MESON_BUILD := true -BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi v3d vc4 freedreno panfrost -BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd broadcom freedreno panfrost - DEVICE_MANIFEST_FILE += device/redroid/manifest.xml diff --git a/redroid_arm64_only/device.mk b/redroid_arm64_only/device.mk index aacfc82..aac7ddb 100644 --- a/redroid_arm64_only/device.mk +++ b/redroid_arm64_only/device.mk @@ -1,5 +1,4 @@ -PRODUCT_PACKAGES += \ - vulkan.broadcom \ - vulkan.freedreno \ - vulkan.panfrost \ +PRODUCT_COPY_FILES += \ + device/redroid/mediacodec.policy.arm:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ +$(call inherit-product, device/redroid-prebuilts/prebuilts_arm.mk) diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk index 16f31c2..ca1ae39 100755 --- a/redroid_x86_64/BoardConfig.mk +++ b/redroid_x86_64/BoardConfig.mk @@ -14,9 +14,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216 -BOARD_MESA3D_USES_MESON_BUILD := true -BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi i915 iris crocus -BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd intel - DEVICE_MANIFEST_FILE += device/redroid/manifest.xml diff --git a/redroid_x86_64/device.mk b/redroid_x86_64/device.mk index e967bb8..4eb8dca 100644 --- a/redroid_x86_64/device.mk +++ b/redroid_x86_64/device.mk @@ -1,3 +1,4 @@ -PRODUCT_PACKAGES += \ - vulkan.intel \ +PRODUCT_COPY_FILES += \ + device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ +$(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk) diff --git a/redroid_x86_64_only/BoardConfig.mk b/redroid_x86_64_only/BoardConfig.mk index 0868ecb..324e488 100755 --- a/redroid_x86_64_only/BoardConfig.mk +++ b/redroid_x86_64_only/BoardConfig.mk @@ -10,9 +10,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216 -BOARD_MESA3D_USES_MESON_BUILD := true -BOARD_MESA3D_GALLIUM_DRIVERS := virgl radeonsi i915 iris crocus -BOARD_MESA3D_VULKAN_DRIVERS := virtio-experimental amd intel - DEVICE_MANIFEST_FILE += device/redroid/manifest.xml diff --git a/redroid_x86_64_only/device.mk b/redroid_x86_64_only/device.mk index e967bb8..4eb8dca 100644 --- a/redroid_x86_64_only/device.mk +++ b/redroid_x86_64_only/device.mk @@ -1,3 +1,4 @@ -PRODUCT_PACKAGES += \ - vulkan.intel \ +PRODUCT_COPY_FILES += \ + device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ +$(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)