From 74b7a2a871a327310a47fa658ad891a828ff294b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 2 Jul 2021 22:42:14 -0700 Subject: [PATCH] Remove gralloc3 support for gs101. All devices use gralloc4 now, so this code is unused. Bug: 174998182 Test: builds for the affected devices Change-Id: Icff36a0204f7f9fd10ae7269248aef8a08c5fc1e --- BoardConfig-common.mk | 14 -------------- device.mk | 27 ++++++--------------------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 35c29d0a..ba119b9c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -94,7 +94,6 @@ BOARD_EGL_CFG := device/google/gs101/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 @@ -102,7 +101,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true BOARD_USES_SWIFTSHADER := false # Gralloc4 -ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) SOONG_CONFIG_NAMESPACES += arm_gralloc SOONG_CONFIG_arm_gralloc := \ gralloc_arm_no_external_afbc \ @@ -126,18 +124,6 @@ SOONG_CONFIG_arm_gralloc_gralloc_init_afbc := true SOONG_CONFIG_arm_gralloc_dpu_support_1010102_afbc := true endif # ifeq ($(BOARD_USES_SWIFTSHADER),true) SOONG_CONFIG_arm_gralloc_gralloc_ion_sync_on_lock := $(BOARD_USES_GRALLOC_ION_SYNC) -endif # ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) - -# libVendorGraphicbuffer -SOONG_CONFIG_NAMESPACES += vendorgraphicbuffer -SOONG_CONFIG_vendorgraphicbuffer := \ - gralloc_version - -ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) -SOONG_CONFIG_vendorgraphicbuffer_gralloc_version := four -else -SOONG_CONFIG_vendorgraphicbuffer_gralloc_version := three -endif # Graphics #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true diff --git a/device.mk b/device.mk index 95824efc..889cc2c0 100644 --- a/device.mk +++ b/device.mk @@ -45,8 +45,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_nos/host/android \ vendor/google_nos/test/system-test-harness -DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4 - ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 else @@ -192,13 +190,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # #################### # Device Manifest, Device Compatibility Matrix for Treble -ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) - DEVICE_MANIFEST_FILE := \ - device/google/gs101/manifest$(LOCAL_64ONLY).xml -else - DEVICE_MANIFEST_FILE := \ - device/google/gs101/manifest$(LOCAL_64ONLY)-gralloc3.xml -endif +DEVICE_MANIFEST_FILE := \ + device/google/gs101/manifest$(LOCAL_64ONLY).xml ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -453,18 +446,10 @@ PRODUCT_PACKAGES += \ com.android.future.usb.accessory # for now include gralloc here. should come from hardware/google_devices/exynos5 -ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) - PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@4.0-impl \ - android.hardware.graphics.allocator@4.0-service \ - android.hardware.graphics.allocator@4.0-impl -else - PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@2.0-impl \ - android.hardware.graphics.allocator@2.0-service \ - android.hardware.graphics.allocator@2.0-impl \ - gralloc.$(TARGET_BOARD_PLATFORM) -endif +PRODUCT_PACKAGES += \ + android.hardware.graphics.mapper@4.0-impl \ + android.hardware.graphics.allocator@4.0-service \ + android.hardware.graphics.allocator@4.0-impl PRODUCT_PACKAGES += \ memtrack.$(TARGET_BOARD_PLATFORM) \