summaryrefslogtreecommitdiff
path: root/BoardConfig-common.mk
diff options
context:
space:
mode:
authorYichi Chen <yichichen@google.com>2022-05-12 23:58:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-12 23:58:15 +0000
commit809d526c143678423d72b844d01022051dde1b9e (patch)
tree443b6a6f1aad35028f63896e22f8763b86e143be /BoardConfig-common.mk
parent746243b7fa54a12c8a5e7b308b973f8cf2f8ffe8 (diff)
parent6e5d588f64fd529a42a70bd8915ea1be1470c95c (diff)
downloadgs201-809d526c143678423d72b844d01022051dde1b9e.tar.gz
Revert "Revert "[Gralloc] Remove the conditional configs for Gralloc"" am: 6155b7811a am: 6e5d588f64
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18329096 Change-Id: Ibe63012f44a59c6bcdbba92e29101509d33ac3ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'BoardConfig-common.mk')
-rw-r--r--BoardConfig-common.mk12
1 files changed, 1 insertions, 11 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 3867e7d..82b54fe 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -104,7 +104,6 @@ BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
-BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION)
BOARD_USES_ALIGN_RESTRICTION := false
BOARD_USES_GRALLOC_ION_SYNC := true
@@ -112,8 +111,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
BOARD_USES_SWIFTSHADER := false
# Gralloc4
-ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-
ifeq ($(BOARD_USES_SWIFTSHADER),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)
@@ -127,15 +124,8 @@ $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true)
$(call soong_config_set,arm_gralloc,gralloc_init_afbc,true)
$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true)
endif # ifeq ($(BOARD_USES_SWIFTSHADER),true)
-$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC))
-endif # ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-# libVendorGraphicbuffer
-ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-$(call soong_config_set,vendorgraphicbuffer,gralloc_version,four)
-else
-$(call soong_config_set,vendorgraphicbuffer,gralloc_version,three)
-endif
+$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC))
# Graphics
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true