From cb4dbe6454398afa83eba1d979f79dbf62996144 Mon Sep 17 00:00:00 2001 From: Lingfeng Yang Date: Fri, 17 Jun 2022 18:55:10 +0000 Subject: [PATCH] Revert "Switch gs101's GLES system driver to ANGLE" This reverts commit fdcd0ecb956c89014855e72b4629bc973b912034. Reason for revert: Bug: 235862124 Change-Id: I779da4bfce22d2f80f70dda4807e6296a04ca5d4 --- BoardConfig-common.mk | 3 --- device.mk | 14 -------------- 2 files changed, 17 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 60a18c66..73eafa2f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -114,9 +114,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) diff --git a/device.mk b/device.mk index 52c73a57..6201a341 100644 --- a/device.mk +++ b/device.mk @@ -174,9 +174,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 @@ -206,13 +203,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 \ @@ -224,10 +214,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