From 205a0a4851e92efc553f7baf8b17a313adff3281 Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 16 Feb 2022 22:31:14 -0800 Subject: [PATCH] Remove stale gralloc3 configs Bug: 220910504 Test: Boots to home Change-Id: I30a68849413b6927365773a52f543e3a032f18fa --- device.mk | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/device.mk b/device.mk index 9580eba0..5bdd98e0 100644 --- a/device.mk +++ b/device.mk @@ -54,8 +54,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_nos/test/system-test-harness \ vendor/google/camera -DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4 - LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 # OEM Unlock reporting @@ -204,13 +202,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # #################### # Device Manifest, Device Compatibility Matrix for Treble -ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) - DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest.xml -else - DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest-gralloc3.xml -endif +DEVICE_MANIFEST_FILE := \ + device/google/gs201/manifest.xml ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ @@ -453,19 +446,10 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 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 # AIDL memtrack PRODUCT_PACKAGES += \