diff options
| author | Jay Wang <jaytwang@google.com> | 2022-05-12 07:05:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-12 07:05:13 +0000 |
| commit | 3257de1670202d1edba119db27cb9b35c31bb195 (patch) | |
| tree | 63ece10aa4cd43a581fec450a275c6bc4d1e251e | |
| parent | 285b20e57d8a8330b448b0488155f46f212e7e0b (diff) | |
| parent | 184562c0f8508b2c06ab322b0aa042a36da720f8 (diff) | |
| download | gs201-3257de1670202d1edba119db27cb9b35c31bb195.tar.gz | |
Revert "[Gralloc] Remove the conditional configs for Gralloc" am: 184562c0f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18310586
Change-Id: I03a0b0c52448be3874c4e6d28451073e74a252f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | BoardConfig-common.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 82b54fe..3867e7d 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -104,6 +104,7 @@ 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 @@ -111,6 +112,8 @@ 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) @@ -124,8 +127,15 @@ $(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 # Graphics #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true |