Update device.mk. am: 45dc0d098a

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

Change-Id: Id0e7dbcb632d37bce8435e79fa09619dbf8ffe86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin 2023-05-05 17:04:30 +00:00 committed by Automerger Merge Worker
commit 49ca892ffb
2 changed files with 0 additions and 17 deletions

View file

@ -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)

View file

@ -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