From bcd4a154d2884cf30ff5712f23ab3a3cefcefb17 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Wed, 26 Apr 2023 01:25:33 +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: Ib9d869ab533f894f39a439e4e6c8910d57b492f2 --- device.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/device.mk b/device.mk index 35064892..829e6a39 100644 --- a/device.mk +++ b/device.mk @@ -189,9 +189,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 @@ -229,13 +226,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 \ @@ -247,10 +237,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