Skip to content

Commit 37de9f1

Browse files
committed
chromium: incorporate upstream ANGLE and Swiftshader changes
As discovered by @rakuco during the discussion off #695, we missed some upstream changes to what libraries are built and installed for ANGLE and Swiftshader: * https://chromium-review.googlesource.com/c/chromium/src/+/3380402 Removed legacy Swiftshader. We don't need to install libEGL.so and libGLESv2.so to chromium/swiftshader anymore. * https://chromium-review.googlesource.com/c/chromium/src/+/3015696 Install libvulkan.so.1, which ANGLE needs. * https://chromium-review.googlesource.com/c/chromium/src/+/2845811 Install Swiftshader VK files. Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent 2f5fe79 commit 37de9f1

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,22 @@ do_install() {
475475
# modifying the dummy "CHROME_EXTRA_ARGS" line
476476
sed -i "s/^CHROME_EXTRA_ARGS=\"\"/CHROME_EXTRA_ARGS=\"${CHROMIUM_EXTRA_ARGS}\"/" ${D}${libdir}/chromium/chromium-wrapper
477477

478-
# This is ANGLE, not to be confused with the similarly named files under swiftshader/
478+
# ANGLE.
479479
if [ -e libEGL.so ]; then
480-
install -m 0755 libEGL.so ${D}${libdir}/chromium/
480+
install -m 0644 libEGL.so ${D}${libdir}/chromium/
481+
install -m 0644 libGLESv2.so ${D}${libdir}/chromium/
481482
fi
482-
if [ -e libGLESv2.so ]; then
483-
install -m 0755 libGLESv2.so ${D}${libdir}/chromium/
483+
484+
# libvulkan (for ANGLE).
485+
if [ -e libvulkan.so.1 ]; then
486+
install -m 0644 libvulkan.so.1 ${D}${libdir}/chromium/
487+
fi
488+
489+
# Swiftshader VK.
490+
if [ -e libvk_swiftshader.so ]; then
491+
install -m 0644 libvk_swiftshader.so ${D}${libdir}/chromium/
492+
# This is needed for ANGLE to find libvk_swiftshader.so.
493+
install -m 0644 vk_swiftshader_icd.json ${D}${libdir}/chromium/
484494
fi
485495

486496
if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'component-build', 'component-build', '', d)}" ]; then
@@ -494,13 +504,6 @@ do_install() {
494504
install -m 0755 libminigbm.so ${D}${libdir}/chromium/
495505
fi
496506

497-
# Swiftshader is only built for x86 and x86-64.
498-
if [ -d "swiftshader" ]; then
499-
install -d ${D}${libdir}/chromium/swiftshader
500-
install -m 0644 swiftshader/libEGL.so ${D}${libdir}/chromium/swiftshader/
501-
install -m 0644 swiftshader/libGLESv2.so ${D}${libdir}/chromium/swiftshader/
502-
fi
503-
504507
# ChromeDriver.
505508
install -m 0755 chromedriver.unstripped ${D}${bindir}/chromedriver
506509

0 commit comments

Comments
 (0)