Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix swiftshader libs and properties

Browse source 
Bug: 268269980
Test: Boots to home with SW and SELinux disabled
Change-Id: Ib833e1f575ce3172e40e8975eefe57a4c23414c4
This commit is contained in:
Ankit Goyal 2023-04-21 11:03:05 -07:00 • committed by Treehugger Robot
parent acdb574bd2
commit 0606f21e3e
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
device.mk
View file

@ -218,7 +218,11 @@ USES_GAUDIO := true
USE_SWIFTSHADER := false USE_SWIFTSHADER := false
# HWUI # HWUI
TARGET_USES_VULKAN = true ifeq ($(USE_SWIFTSHADER),true)
TARGET_USES_VULKAN = false
else
TARGET_USES_VULKAN = true
endif
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/arm/mali/valhall vendor/arm/mali/valhall
@ -233,9 +237,6 @@ PRODUCT_PACKAGES += \
libOpenCL \ libOpenCL \
libgpudataproducer \ libgpudataproducer \
PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.vulkan=mali
# Mali Configuration Properties # Mali Configuration Properties
# b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2 # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -245,13 +246,6 @@ PRODUCT_VENDOR_PROPERTIES += \
vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.base_protected_tls_max=67108864 \
vendor.mali.platform_agt_frequency_khz=24576 vendor.mali.platform_agt_frequency_khz=24576
ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_PACKAGES += \
libGLESv1_CM_swiftshader \
libEGL_swiftshader \
libGLESv2_swiftshader
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 \
@ -260,12 +254,20 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml frameworks/native/data/etc/android.software.opengles.deqp.level-2023-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_PACKAGES += \
vulkan.pastel
endif
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader ro.hardware.egl = mali \
persist.graphics.egl = angle \
ro.hardware.vulkan = pastel
else else
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali ro.hardware.egl = mali \
ro.hardware.vulkan = mali
endif endif
# Configure EGL blobcache # Configure EGL blobcache