Snap for 8741820 from f968a86de7 to udc-release

Change-Id: I3206383d214be6fd5fc4f451748f3a089b5b7eda
This commit is contained in:
Android Build Coastguard Worker 2022-06-18 05:07:48 +00:00
commit 0694a6171f
2 changed files with 0 additions and 17 deletions

View file

@ -114,9 +114,6 @@ BOARD_USES_GRALLOC_ION_SYNC := true
# This should be the same value as USE_SWIFTSHADER in device.mk # This should be the same value as USE_SWIFTSHADER in device.mk
BOARD_USES_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false
# This should be the same value as USE_ANGLE in device.mk
BOARD_USES_ANGLE := true
# Gralloc4 # Gralloc4
ifeq ($(BOARD_USES_SWIFTSHADER),true) ifeq ($(BOARD_USES_SWIFTSHADER),true)
$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true) $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)

View file

@ -174,9 +174,6 @@ endif
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := false USE_SWIFTSHADER := false
# Must match BOARD_USES_ANGLE in BoardConfig.mk
USE_ANGLE := true
# HWUI # HWUI
TARGET_USES_VULKAN = true TARGET_USES_VULKAN = true
@ -206,13 +203,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_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.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) 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