Update device.mk. am: bcd4a154d2

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

Change-Id: Iafd2489b6df8b9edf49f75dad34115938f42e661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin 2023-05-05 16:54:26 +00:00 committed by Automerger Merge Worker
commit befcaf0693

View file

@ -189,9 +189,6 @@ USES_GAUDIO := true
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := false USE_SWIFTSHADER := false
# by default, USE_ANGLE is false
USE_ANGLE ?= false
# HWUI # HWUI
TARGET_USES_VULKAN = true TARGET_USES_VULKAN = true
@ -229,13 +226,6 @@ PRODUCT_PACKAGES += \
libGLESv2_swiftshader libGLESv2_swiftshader
endif endif
ifeq ($(USE_ANGLE),true)
PRODUCT_PACKAGES += \
libEGL_angle \
libGLESv1_CM_angle \
libGLESv2_angle
endif
PRODUCT_COPY_FILES += \ 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.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 \ 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) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader ro.hardware.egl = swiftshader
else ifeq ($(USE_ANGLE),true)
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = angle \
ro.hardware.egl_legacy = mali
else else
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali ro.hardware.egl = mali