Merge "Use bare-bones prebuilt GPU libs for now"

This commit is contained in:
TreeHugger Robot 2021-05-26 22:36:47 +00:00 committed by Android (Google) Code Review
commit c27f35185a

View file

@ -133,7 +133,7 @@ endif
# GRAPHICS - GPU (begin) # GRAPHICS - GPU (begin)
# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
USE_SWIFTSHADER := true USE_SWIFTSHADER := false
# HWUI # HWUI
TARGET_USES_VULKAN = false TARGET_USES_VULKAN = false
@ -145,11 +145,12 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libGLES_mali \ libGLES_mali-prebuilt-gs201 \
vulkan.gs101 \ mali_csffw.bin-ramdisk \
libOpenCL \ # vulkan.gs101 \
libgpudataproducer # libOpenCL \
# android.hardware.neuralnetworks@1.3-service-armnn \ # android.hardware.neuralnetworks@1.3-service-armnn \
# libgpudataproducer
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -171,12 +172,12 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader ro.hardware.egl = swiftshader
else else
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali ro.hardware.egl = mali_gs201
endif endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.opengles.version=196610 \ ro.opengles.version=196610 \
graphics.gpu.profiler.support=true \
debug.renderengine.backend=gles debug.renderengine.backend=gles
# graphics.gpu.profiler.support=true \
# GRAPHICS - GPU (end) # GRAPHICS - GPU (end)
# #################### # ####################