Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove gralloc3 support for gs101. am: 942c0fd2f3

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15194381

Change-Id: I8d4cf240762f39ce3a5f3730a9c0e025d8427ece
This commit is contained in:
Krzysztof Kosiński 2021-07-08 22:46:44 +00:00 • committed by Automerger Merge Worker
commit d65131b19f
2 changed files with 6 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
BoardConfig-common.mk
View file

@ -94,7 +94,6 @@ BOARD_EGL_CFG := device/google/gs101/conf/egl.cfg
USE_OPENGL_RENDERER := true USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
BOARD_USES_EXYNOS5_COMMON_GRALLOC := true BOARD_USES_EXYNOS5_COMMON_GRALLOC := true
BOARD_USES_EXYNOS_GRALLOC_VERSION := $(DEVICE_USES_EXYNOS_GRALLOC_VERSION)
BOARD_USES_ALIGN_RESTRICTION := false BOARD_USES_ALIGN_RESTRICTION := false
BOARD_USES_GRALLOC_ION_SYNC := true BOARD_USES_GRALLOC_ION_SYNC := true
@ -102,7 +101,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
BOARD_USES_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false
# Gralloc4 # Gralloc4
ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
SOONG_CONFIG_NAMESPACES += arm_gralloc SOONG_CONFIG_NAMESPACES += arm_gralloc
SOONG_CONFIG_arm_gralloc := \ SOONG_CONFIG_arm_gralloc := \
gralloc_arm_no_external_afbc \ 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 SOONG_CONFIG_arm_gralloc_dpu_support_1010102_afbc := true
endif # ifeq ($(BOARD_USES_SWIFTSHADER),true) endif # ifeq ($(BOARD_USES_SWIFTSHADER),true)
SOONG_CONFIG_arm_gralloc_gralloc_ion_sync_on_lock := $(BOARD_USES_GRALLOC_ION_SYNC) 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 # Graphics
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true

27
device.mk
View file

@ -45,8 +45,6 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google_nos/host/android \ vendor/google_nos/host/android \
vendor/google_nos/test/system-test-harness vendor/google_nos/test/system-test-harness
DEVICE_USES_EXYNOS_GRALLOC_VERSION := 4
ifeq ($(TARGET_PREBUILT_KERNEL),) ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
else else
@ -192,13 +190,8 @@ PRODUCT_VENDOR_PROPERTIES += \
# #################### # ####################
# Device Manifest, Device Compatibility Matrix for Treble # Device Manifest, Device Compatibility Matrix for Treble
ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) DEVICE_MANIFEST_FILE := \
DEVICE_MANIFEST_FILE := \ device/google/gs101/manifest$(LOCAL_64ONLY).xml
device/google/gs101/manifest$(LOCAL_64ONLY).xml
else
DEVICE_MANIFEST_FILE := \
device/google/gs101/manifest$(LOCAL_64ONLY)-gralloc3.xml
endif
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
@ -453,18 +446,10 @@ PRODUCT_PACKAGES += \
com.android.future.usb.accessory com.android.future.usb.accessory
# for now include gralloc here. should come from hardware/google_devices/exynos5 # for now include gralloc here. should come from hardware/google_devices/exynos5
ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl \
android.hardware.graphics.mapper@4.0-impl \ android.hardware.graphics.allocator@4.0-service \
android.hardware.graphics.allocator@4.0-service \ android.hardware.graphics.allocator@4.0-impl
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 += \ PRODUCT_PACKAGES += \
memtrack.$(TARGET_BOARD_PLATFORM) \ memtrack.$(TARGET_BOARD_PLATFORM) \