Skip to content

Fix mesa3d waydroid build #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: lineage-20
Choose a base branch
from
Open

Fix mesa3d waydroid build #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd45122
Declare overriding commands
aleasto Feb 3, 2023
0dbe14f
Removed audio A2dp from device.mk
Mar 4, 2022
f81786f
Remove vndk_lite
aleasto Feb 5, 2023
5e03146
Build new vulkan swiftshader
aleasto Feb 5, 2023
1c12f72
Build squashfs images
aleasto Jan 23, 2023
70e8599
Add VNDK 30 package
aleasto Feb 23, 2023
8c4353e
overlay-lineage: Hide and disable status bar DT2S gesture
bgcngm Oct 2, 2023
e516932
variants: Just build Mesa3D arm drivers on arm variants
EliasTheGrandMasterOfMistakes Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ ifneq ($(TARGET_USE_MESA),false)
BOARD_MESA3D_USES_MESON_BUILD := true
BOARD_MESA3D_MESON_ARGS := -Dallow-kcmp=enabled -Dintel-clc=system
BOARD_MESA3D_BUILD_LIBGBM := true
BOARD_MESA3D_GALLIUM_DRIVERS := r300 r600 nouveau freedreno llvmpipe v3d vc4 etnaviv tegra svga virgl panfrost lima radeonsi
BOARD_MESA3D_VULKAN_DRIVERS := broadcom freedreno panfrost swrast virtio amd
BOARD_MESA3D_GALLIUM_DRIVERS := r300 r600 nouveau llvmpipe svga virgl lima radeonsi
BOARD_MESA3D_VULKAN_DRIVERS := swrast virtio amd
endif

# Filesystem
Expand All @@ -61,8 +61,15 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
TARGET_COPY_OUT_VENDOR := vendor
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3547483648
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR := gzip
BOARD_VENDORIMAGE_PARTITION_SIZE := 1547483648
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := squashfs
BOARD_VENDORIMAGE_SQUASHFS_COMPRESSOR := gzip

# Disable scudo
MALLOC_SVELTE := true

# Offending entries:
# /system/etc/libnfc-nci.conf
BUILD_BROKEN_DUP_RULES := true
18 changes: 8 additions & 10 deletions device.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ PRODUCT_PACKAGES += \
audio.primary.waydroid \
audio.r_submix.default \
audio.usb.default \
audio.a2dp.default \
libasound_module_pcm_pulse \
libasound_module_ctl_pulse \
libasound_module_conf_pulse
Expand Down Expand Up @@ -63,9 +62,10 @@ PRODUCT_PACKAGES += \
hwcomposer.waydroid

PRODUCT_PACKAGES += \
libEGL_swiftshader \
libGLESv1_CM_swiftshader \
libGLESv2_swiftshader
libEGL_angle \
libGLESv1_CM_angle \
libGLESv2_angle \
vulkan.pastel

ifneq ($(TARGET_USE_MESA),false)
PRODUCT_PACKAGES += \
Expand Down Expand Up @@ -151,7 +151,9 @@ PRODUCT_PACKAGES += \
NfcNci

# Overlays
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay \
$(LOCAL_PATH)/overlay-lineage

# Permissions
PRODUCT_COPY_FILES += \
Expand Down Expand Up @@ -200,16 +202,12 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += \
$(LOCAL_PATH)

# VNDK
PRODUCT_PACKAGES += \
ld.config.vndk_lite.txt

# Binder IPC
PRODUCT_PACKAGES += \
vndservicemanager

ifeq ($(filter %_waydroid_x86 %_waydroid_x86_64,$(TARGET_PRODUCT)),)
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
endif

# Updater
Expand Down
10 changes: 10 additions & 0 deletions overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2023 The Waydroid Project
SPDX-License-Identifier: Apache-2.0
-->
<resources>
<!-- Default values for status bar DT2S gesture -->
<bool name="config_dt2sGestureAvailable">false</bool>
<bool name="config_dt2sGestureEnabledByDefault">false</bool>
</resources>
5 changes: 5 additions & 0 deletions waydroid_arm/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ TARGET_ARCH_VARIANT := armv7-a-neon
TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_VARIANT := generic

ifneq ($(TARGET_USE_MESA),false)
BOARD_MESA3D_GALLIUM_DRIVERS += freedreno v3d vc4 etnaviv tegra panfrost
BOARD_MESA3D_VULKAN_DRIVERS += broadcom fredreno panfrost
endif
5 changes: 5 additions & 0 deletions waydroid_arm64/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := generic

ifneq ($(TARGET_USE_MESA),false)
BOARD_MESA3D_GALLIUM_DRIVERS += freedreno v3d vc4 etnaviv tegra panfrost
BOARD_MESA3D_VULKAN_DRIVERS += broadcom fredreno panfrost
endif
5 changes: 5 additions & 0 deletions waydroid_arm64_only/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ TARGET_2ND_CPU_ABI2 :=
TARGET_2ND_CPU_VARIANT :=

AUDIOSERVER_MULTILIB := first

ifneq ($(TARGET_USE_MESA),false)
BOARD_MESA3D_GALLIUM_DRIVERS += freedreno v3d vc4 etnaviv tegra panfrost
BOARD_MESA3D_VULKAN_DRIVERS += broadcom fredreno panfrost
endif