Revert "Switch Pixel 6 GLES system driver to ANGLE"

This reverts commit 22fe58d389.

Reason for revert: b/234156322

Change-Id: I7902283839c7501d374fa4daf6e02e1bca54d390
This commit is contained in:
Ioannis Ilkos 2022-05-30 17:55:38 +00:00 committed by TreeHugger Robot
parent edfb03fe42
commit 868fd3837f
2 changed files with 0 additions and 17 deletions

View file

@ -115,9 +115,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
# This should be the same value as USE_SWIFTSHADER in device.mk
BOARD_USES_SWIFTSHADER := false
# This should be the same value as USE_ANGLE in device.mk
BOARD_USES_ANGLE := true
# Gralloc4
ifeq ($(BOARD_USES_SWIFTSHADER),true)
$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)

View file

@ -179,9 +179,6 @@ endif
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := false
# Must match BOARD_USES_ANGLE in BoardConfig.mk
USE_ANGLE := true
# HWUI
TARGET_USES_VULKAN = true
@ -211,13 +208,6 @@ PRODUCT_PACKAGES += \
libGLESv2_swiftshader
endif
ifeq ($(USE_ANGLE),true)
PRODUCT_PACKAGES += \
libEGL_angle \
libGLESv1_CM_angle \
libGLESv2_angle
endif
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@ -229,10 +219,6 @@ PRODUCT_COPY_FILES += \
ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader
else ifeq ($(USE_ANGLE),true)
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = angle \
ro.hardware.egl_legacy = mali
else
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali