From b4558f75bd32db2c1d13a767e897bc7850e6f23f Mon Sep 17 00:00:00 2001 From: Ivan Zaitsev Date: Wed, 27 Apr 2022 08:51:11 -0700 Subject: [PATCH] zuma: Fix zuma-zebu build with swiftshader Build system was complaining about ro.hardware.vulkan being assigned to different values(pastel and mali) if swiftshader is active for zuma-zebu device. Signed-off-by: Ivan Zaitsev Change-Id: I7f6c8223b9e83e0365ffce36d03edb88bc06499e --- device.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/device.mk b/device.mk index 5b6444cc..c9d5d864 100644 --- a/device.mk +++ b/device.mk @@ -188,10 +188,7 @@ PRODUCT_PACKAGES += \ libGLES_mali \ vulkan.mali \ libOpenCL \ - libgpudataproducer \ - -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.vulkan=mali + libgpudataproducer ifeq ($(USE_SWIFTSHADER),true) PRODUCT_PACKAGES += \ @@ -210,10 +207,12 @@ PRODUCT_COPY_FILES += \ ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = swiftshader + ro.hardware.egl = swiftshader \ + ro.hardware.vulkan = pastel else PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali + ro.hardware.egl = mali \ + ro.hardware.vulkan = mali endif PRODUCT_VENDOR_PROPERTIES += \