From cd45122751df0b949f444665d3aece5dd331c756 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 3 Feb 2023 17:22:08 +0100 Subject: [PATCH 1/8] Declare overriding commands --- BoardConfig.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfig.mk b/BoardConfig.mk index f21f4bd..0138493 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -66,3 +66,7 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 # Disable scudo MALLOC_SVELTE := true + +# Offending entries: +# /system/etc/libnfc-nci.conf +BUILD_BROKEN_DUP_RULES := true From 0dbe14f8805f180ea5a7a14c97d45164fea3abce Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Fri, 4 Mar 2022 13:31:43 +0000 Subject: [PATCH 2/8] Removed audio A2dp from device.mk Bug: 220306859 Test: atest Tag: #feature Change-Id: I1af8461f8ad82afbb21b43dd6968e824ea89f5d6 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index ae3899b..944879a 100644 --- a/device.mk +++ b/device.mk @@ -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 From f81786f835fecc0b8ec0964201b498d74b954817 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 5 Feb 2023 17:52:04 +0100 Subject: [PATCH 3/8] Remove vndk_lite Does not exist anymore --- device.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device.mk b/device.mk index 944879a..2369f46 100644 --- a/device.mk +++ b/device.mk @@ -199,10 +199,6 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) -# VNDK -PRODUCT_PACKAGES += \ - ld.config.vndk_lite.txt - # Binder IPC PRODUCT_PACKAGES += \ vndservicemanager From 5e0314647bde8b8d7c6577553c8219b26672e432 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 5 Feb 2023 17:52:53 +0100 Subject: [PATCH 4/8] Build new vulkan swiftshader --- device.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 2369f46..7704fc5 100644 --- a/device.mk +++ b/device.mk @@ -62,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 += \ From 1c12f721d29ce0f79235ab9c501023863d20c38b Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 23 Jan 2023 19:02:16 +0100 Subject: [PATCH 5/8] Build squashfs images --- BoardConfig.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 0138493..46ea984 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -61,8 +61,11 @@ 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 From 70e85993bd6bd30962f84bd1982f8dd8b8701fb4 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Thu, 23 Feb 2023 11:03:52 +0100 Subject: [PATCH 6/8] Add VNDK 30 package --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 7704fc5..0b3c91b 100644 --- a/device.mk +++ b/device.mk @@ -205,7 +205,7 @@ 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 From 8c4353e9cd288eaa4abf0678d991df7c075e19e6 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 2 Oct 2023 10:09:23 +0100 Subject: [PATCH 7/8] overlay-lineage: Hide and disable status bar DT2S gesture Change-Id: I208701b60ddfdd2a15ff17800124c3a693f2990d --- device.mk | 4 +++- .../lineage-sdk/lineage/res/res/values/config.xml | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml diff --git a/device.mk b/device.mk index 0b3c91b..56f2e46 100644 --- a/device.mk +++ b/device.mk @@ -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 += \ diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml new file mode 100644 index 0000000..0d0ceac --- /dev/null +++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml @@ -0,0 +1,10 @@ + + + + + false + false + From e5169321229fd307445a2e3d4fc3623529fe0f22 Mon Sep 17 00:00:00 2001 From: EliasTheGrandMasterOfMistakes <149844945+EliasTheGrandMasterOfMistakes@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:49:45 -0300 Subject: [PATCH 8/8] variants: Just build Mesa3D arm drivers on arm variants Building exclusive arm drivers is unecessary to x86 platforms, this fixes a build error when x86 can't be build because of etnaviv dependencies and remove unecessary drivers --- BoardConfig.mk | 4 ++-- waydroid_arm/BoardConfig.mk | 5 +++++ waydroid_arm64/BoardConfig.mk | 5 +++++ waydroid_arm64_only/BoardConfig.mk | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 46ea984..ac72f8f 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -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 diff --git a/waydroid_arm/BoardConfig.mk b/waydroid_arm/BoardConfig.mk index 18dfccd..07fa55e 100644 --- a/waydroid_arm/BoardConfig.mk +++ b/waydroid_arm/BoardConfig.mk @@ -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 diff --git a/waydroid_arm64/BoardConfig.mk b/waydroid_arm64/BoardConfig.mk index df026ee..fef3b74 100644 --- a/waydroid_arm64/BoardConfig.mk +++ b/waydroid_arm64/BoardConfig.mk @@ -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 diff --git a/waydroid_arm64_only/BoardConfig.mk b/waydroid_arm64_only/BoardConfig.mk index a8815fd..3bc4f73 100644 --- a/waydroid_arm64_only/BoardConfig.mk +++ b/waydroid_arm64_only/BoardConfig.mk @@ -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