Remove stale gralloc3 configs

Bug: 220910504
Test: Boots to home
Change-Id: I30a68849413b6927365773a52f543e3a032f18fa
This commit is contained in:
Ankit Goyal 2022-02-16 22:31:14 -08:00
parent ef1c863453
commit 205a0a4851

View file

@ -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 += \