From 45dc0d098a0da19bc893bf4cd8d7d06ab6318a1d Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Wed, 26 Apr 2023 01:22:03 +0000
Subject: [PATCH] Update device.mk.

USE_ANGLE in moved to core.mk across platform, this patch updated the
usage of it in device.mk.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I58d57cd5e58d0a4706e8771ffb5e903795954f19
---
 BoardConfig-common.mk |  3 ---
 device.mk             | 14 --------------
 2 files changed, 17 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 807e60c6..92dab880 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -124,9 +124,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 := false
-
 # 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 fd40ac58..afab0540 100644
--- a/device.mk
+++ b/device.mk
@@ -211,9 +211,6 @@ USES_GAUDIO := true
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
 USE_SWIFTSHADER := false
 
-# by default, USE_ANGLE is false
-USE_ANGLE ?= false
-
 # HWUI
 TARGET_USES_VULKAN = true
 
@@ -250,13 +247,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_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -268,10 +258,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