From e96fad89d1b97ae4a9c2eeb7946593879545137b Mon Sep 17 00:00:00 2001
From: Taeyang Choi <taeyang.choi@samsung.com>
Date: Wed, 9 Aug 2023 15:59:48 +0900
Subject: [PATCH] fix configuration for SWIFTSHADER

Bug: 295365113
Change-Id: I5f48147f1df5bb76dfd2c3bff686fd9d4cb565a1
Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com>
Signed-off-by: Taeyang Choi <taeyang.choi@samsung.com>
---
 BoardConfig-common.mk |  4 +++-
 device.mk             | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d2d094a..886690d 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -109,11 +109,13 @@ BOARD_USES_ALIGN_RESTRICTION := false
 BOARD_USES_GRALLOC_ION_SYNC := true
 
 # This should be the same value as USE_SWIFTSHADER in device.mk
-BOARD_USES_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER ?= false
 
 # Gralloc4
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
+$(warning BOARD_USES_SWIFTSHADER set to current target)
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/cuttlefish/shared/angle/sepolicy
 TARGET_DISABLE_TRIPLE_BUFFERING := true
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
 $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false)
diff --git a/device.mk b/device.mk
index 0891b39..a49fe54 100644
--- a/device.mk
+++ b/device.mk
@@ -214,10 +214,15 @@ USES_GAUDIO := true
 # GRAPHICS - GPU (begin)
 
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
-USE_SWIFTSHADER := false
+USE_SWIFTSHADER ?= false
 
 # HWUI
+ifeq ($(USE_SWIFTSHADER),true)
+$(warning USE_SWIFTSHADER set to current target)
+TARGET_USES_VULKAN = false
+else
 TARGET_USES_VULKAN = true
+endif
 
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/arm/mali/valhall
@@ -237,6 +242,7 @@ PRODUCT_PACKAGES += \
 	libgpudataproducer
 
 ifeq ($(USE_SWIFTSHADER),true)
+$(warning USE_SWIFTSHADER set to current target)
 PRODUCT_PACKAGES += \
 	libEGL_angle \
 	libGLESv1_CM_angle \
@@ -246,10 +252,14 @@ PRODUCT_PACKAGES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl=angle \
 	ro.hardware.vulkan=pastel
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiaglthreaded
 else
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl=mali \
 	ro.hardware.vulkan=mali
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiavkthreaded
 endif
 
 # Mali Configuration Properties
@@ -277,7 +287,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiavkthreaded \
 
 # GRAPHICS - GPU (end)
 # ####################