Android/device_redroid
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change to use prebuilts

Browse Source
This commit is contained in:
Ziyang Zhou
2022-05-04 16:03:29 +08:00
parent 08d35342a7
commit bc9cbe7521
7 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gpu_config.sh
View File

@@ -8,10 +8,19 @@ setup_vulkan() {
setprop ro.hardware.vulkan intel setprop ro.hardware.vulkan intel
;; ;;
amdgpu) amdgpu)
setprop ro.hardware.vulkan radv setprop ro.hardware.vulkan radeon
;; ;;
virtio_gpu) virtio_gpu)
# google venus setprop ro.hardware.vulkan virtio
;;
v3d|vc4)
setprop ro.hardware.vulkan broadcom
;;
msm_drm)
setprop ro.hardware.vulkan freedreno
;;
panfrost)
setprop ro.hardware.vulkan panfrost
;; ;;
*) *)
echo "not supported driver: $1" echo "not supported driver: $1"
@@ -25,7 +34,7 @@ setup_render_node() {
echo "force render node: $node" echo "force render node: $node"
setprop gralloc.gbm.device $node setprop gralloc.gbm.device $node
chmod 0666 $node chmod 666 $node
# setup vulkan # setup vulkan
cd /sys/kernel/debug/dri cd /sys/kernel/debug/dri
@@ -41,11 +50,11 @@ setup_render_node() {
echo "DRI node exists, driver: $driver" echo "DRI node exists, driver: $driver"
setup_vulkan $driver setup_vulkan $driver
case $driver in case $driver in
i915|amdgpu|virtio_gpu) i915|amdgpu|virtio_gpu|v3d|vc4|msm_drm|panfrost)
node="/dev/dri/renderD$d" node="/dev/dri/renderD$d"
echo "use render node: $node" echo "use render node: $node"
setprop gralloc.gbm.device $node setprop gralloc.gbm.device $node
chmod 0666 $node chmod 666 $node
return 0 return 0
;; ;;
esac esac
@@ -59,7 +68,6 @@ setup_render_node() {
gpu_setup_host() { gpu_setup_host() {
echo "use GPU host mode" echo "use GPU host mode"
setprop qemu.gles.vendor mesa
setprop ro.hardware.egl mesa setprop ro.hardware.egl mesa
setprop ro.hardware.gralloc gbm setprop ro.hardware.gralloc gbm
setprop ro.kernel.redroid.fps 30 setprop ro.kernel.redroid.fps 30
@@ -95,5 +103,8 @@ gpu_setup() {
fi fi
} }
# ?? workaround for ueventd
chmod 0666 /dev/dri/*
gpu_setup gpu_setup

5
redroid.mk
View File

@@ -15,8 +15,6 @@
PRODUCT_MANUFACTURER := redroid PRODUCT_MANUFACTURER := redroid
PRODUCT_SHIPPING_API_LEVEL := 28 PRODUCT_SHIPPING_API_LEVEL := 28
PRODUCT_SOONG_NAMESPACES += external/mesa3d
# Arm64 linker failed, complain unsupported TLS DT entry # Arm64 linker failed, complain unsupported TLS DT entry
# caused by libclang_rt.ubsan_standalone-aarch64-android.so ?? # caused by libclang_rt.ubsan_standalone-aarch64-android.so ??
# AUDIOSERVER_MULTILIB := first # AUDIOSERVER_MULTILIB := first
@@ -38,8 +36,6 @@ PRODUCT_PACKAGES += \
libGLESv1_CM_swiftshader \ libGLESv1_CM_swiftshader \
libGLESv2_swiftshader \ libGLESv2_swiftshader \
vulkan.pastel \ vulkan.pastel \
libGLES_mesa \
vulkan.radv \
ipconfigstore \ ipconfigstore \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
@@ -99,3 +95,4 @@ $(call inherit-product, device/redroid/phone-xhdpi-6144-dalvik-heap.mk)
$(call inherit-product-if-exists, product.mk) $(call inherit-product-if-exists, product.mk)
$(call inherit-product, device/redroid-prebuilts/prebuilts.mk)

1
redroid_arm64.mk
View File

@@ -16,6 +16,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(LOCAL_PATH)/redroid.mk) $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
$(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
# overrides # overrides
PRODUCT_NAME := redroid_arm64 PRODUCT_NAME := redroid_arm64

13
redroid_arm64/BoardConfig.mk
View File

@@ -1,18 +1,9 @@
include build/make/target/board/generic_arm64_ab/BoardConfig.mk include build/make/target/board/generic_arm64_ab/BoardConfig.mk
TARGET_COPY_OUT_VENDOR := vendor
# ~350M
BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
# ~1.3G
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_GPU_DRIVERS := virgl radeonsi BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
DEVICE_MANIFEST_FILE += device/redroid/manifest.xml DEVICE_MANIFEST_FILE += device/redroid/manifest.xml

4
redroid_arm64/device.mk Normal file
View File

@@ -0,0 +1,4 @@
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)

13
redroid_x86_64/BoardConfig.mk
View File

@@ -1,18 +1,9 @@
include build/make/target/board/generic_x86_64_ab/BoardConfig.mk include build/make/target/board/generic_x86_64_ab/BoardConfig.mk
TARGET_COPY_OUT_VENDOR := vendor
# ~350M
BOARD_VENDORIMAGE_PARTITION_SIZE := 367001600
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
# ~1.3G
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1388314624
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_GPU_DRIVERS := i915 i965 r300g r600g virgl iris radeonsi BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
DEVICE_MANIFEST_FILE += device/redroid/manifest.xml DEVICE_MANIFEST_FILE += device/redroid/manifest.xml

5
redroid_x86_64/device.mk
View File

@@ -1,3 +1,4 @@
PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \
vulkan.intel \ device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
$(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)