X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-wam%2Fchromium%2Fchromium.inc;h=d9500bcd5f90c48502c06ef4ae11f4f55eb2ee6a;hb=84c446d08eff4b519986946ac89b0f742aab1381;hp=d2c9e906521144d5be02c8f6686811eefece249d;hpb=d38602afcce435a102ecb0aa0c40231c266d8ddf;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-wam/chromium/chromium.inc b/recipes-wam/chromium/chromium.inc
index d2c9e9065..d9500bcd5 100644
--- a/recipes-wam/chromium/chromium.inc
+++ b/recipes-wam/chromium/chromium.inc
@@ -12,12 +12,10 @@ LIC_FILES_CHKSUM = "\
 
 require gn-utils.inc
 
-inherit gettext qemu pythonnative
+inherit gettext qemu pythonnative pkgconfig
 
 DEPENDS = "virtual/gettext wayland wayland-native pixman freetype glib-2.0 fontconfig openssl pango cairo icu libxkbcommon libexif dbus pciutils udev libcap alsa-lib virtual/egl elfutils-native libdrm atk at-spi2-atk gperf-native gconf nss nss-native nspr nspr-native bison-native qemu-native curl"
 
-PROVIDES = "${BROWSER_APPLICATION}"
-
 SRCREV_v8 = "1e3af71f1ff3735e8a5b639c48dfca63a7b8a647"
 
 # we don't include SRCPV in PV, so we have to manually include SRCREVs in do_fetch vardeps
@@ -33,17 +31,12 @@ B = "${WORKDIR}/build"
 OUT_DIR = "${B}/${BUILD_TYPE}"
 
 WEBRUNTIME_BUILD_TARGET = "webos:weboswebruntime"
-BROWSER_APP_BUILD_TARGET = "chrome"
-BROWSER_APPLICATION = "chromium-browser"
-BROWSER_APPLICATION_DIR = "/opt/chromium"
 
-TARGET = "${WEBRUNTIME_BUILD_TARGET} ${BROWSER_APP_BUILD_TARGET}"
+TARGET = "${WEBRUNTIME_BUILD_TARGET}"
 
 # Skip do_install:append of webos_system_bus. It is not compatible with this component.
 WEBOS_SYSTEM_BUS_FILES_LOCATION = "${S}/files/sysbus"
 
-PACKAGECONFIG ?= "use-upstream-wayland"
-
 PACKAGECONFIG[lttng] = "use_lttng=true,use_lttng=false,lttng-ust,lttng-tools lttng-modules babeltrace"
 
 # Chromium can use v4l2 device for hardware accelerated video decoding on such boards as Renesas R-car M3, for example.
@@ -51,11 +44,6 @@ PACKAGECONFIG[lttng] = "use_lttng=true,use_lttng=false,lttng-ust,lttng-tools ltt
 # See https://github.com/igel-oss/meta-browser-hwdecode/tree/igalia-chromium71.
 PACKAGECONFIG[use-linux-v4l2] = "use_v4l2_codec=true use_v4lplugin=true use_linux_v4l2_only=true"
 
-PACKAGECONFIG[use-upstream-wayland] = " \
-    ozone_platform_wayland_external=false ozone_platform_wayland=true, \
-    ozone_platform_wayland_external=true ozone_platform_wayland=false \
-"
-
 # Options to enable debug build. Add this PACKAGECONFIG to local.conf
 # to enable debug build. By default debug is completely disabled to
 # speed up build
@@ -73,7 +61,7 @@ GN_ARGS = "\
     use_x11=false\
     is_agl=true\
     use_cbe=true\
-    is_chrome_cbe=true\
+    is_chrome_cbe=false\
     is_component_build=false\
     use_cups=false\
     use_custom_libcxx=false\
@@ -111,6 +99,11 @@ GN_ARGS += "use_thin_lto=false"
 # let Yocto handle everything.
 GN_ARGS += "use_sysroot=false"
 
+# Reduce the size of the build by removing swiftshader and dawn.
+# This will effectively block support for WebGPU.
+# TODO(jdapena): reenable WebGPU support
+GN_ARGS += "use_swiftshader=false enable_swiftshader_vulkan=false use_dawn=false"
+
 # ARM builds need special additional flags (see ${S}/build/config/arm.gni).
 # If we do not pass |arm_arch| and friends to GN, it will deduce a value that
 # will then conflict with TUNE_CCARGS and CC.
@@ -156,6 +149,9 @@ GN_ARGS:append:armv6 = ' arm_use_neon=false'
 # https://github.com/gperftools/gperftools/issues/693
 GN_ARGS:append:libc-musl = ' use_allocator_shim=false'
 
+# Chromium 91 build of highway with NEON is broken. Do not build.
+GN_ARGS:append:aarch64 = ' enable_jxl_decoder=false'
+
 # More options to speed up the build
 GN_ARGS += "\
     enable_nacl=false\
@@ -213,36 +209,6 @@ configure_env() {
 
 WINDOW_SIZE ?= "1920,1080"
 
-configure_browser_settings() {
-    USER_AGENT="Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Safari/537.31"
-    echo "${USER_AGENT}" > ${D_DIR}/user_agent_conf
-    #We can replace below WINDOW_SIZE values from build configuration if available
-    #echo "${WINDOW_SIZE}" > ${D_DIR}/window_size_conf
-}
-
-install_chromium_browser() {
-    # Install browser files
-    ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR} webos/install/default_browser
-
-    D_DIR=${D}${BROWSER_APPLICATION_DIR}
-    L_DIR=${D}${CBE_DATA_PATH}
-    install -d ${D_DIR}
-    install -d ${L_DIR}
-
-    cp -R --no-dereference --preserve=mode,links -v ${OUT_DIR}/image/${BROWSER_APPLICATION_DIR}/* ${D_DIR}
-
-    # AGL does not have PMLOG
-    sed -i.bak s/PmLogCtl.*// ${D_DIR}/run_webbrowser
-
-    # To execute chromium in JAILER, Security Part needs permissions change
-    # run_webbrowser: Script file for launching chromium
-    chmod -v 755 ${D_DIR}/chrome
-    chmod -v 755 ${D_DIR}/kill_webbrowser
-    chmod -v 755 ${D_DIR}/run_webbrowser
-
-    configure_browser_settings
-}
-
 install_webruntime() {
 
     # # Generate install webos webview files
@@ -254,12 +220,8 @@ install_webruntime() {
     # mv ${D}${includedir}/webruntime ${D}${includedir}/${BPN}
     # mv ${D}${CBE_DATA_PATH}/neva_locales ${D}${CBE_DATA_LOCALES_PATH}
 
-    # # move this to separate mksnapshot-cross recipe once we figure out how to build just cross mksnapshot from chromium repository
-    # install -d ${D}${bindir_cross}
-    # gzip -c ${OUT_DIR}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${bindir_cross}/${HOST_SYS}-mksnapshot.gz
-
     install -d ${D}${libdir}
-    install -d ${D}${libdir}/swiftshader
+    # install -d ${D}${libdir}/swiftshader
     install -d ${D}${includedir}/${BPN}
     install -d ${D}${CBE_DATA_PATH}
     install -d ${D}${CBE_DATA_LOCALES_PATH}
@@ -267,7 +229,7 @@ install_webruntime() {
     # Install webos webview files
     ${S}/depot_tools/ninja ${PARALLEL_MAKE} -C ${OUT_DIR} webos/install/weboswebruntime
 
-    install -v -m 0644 ${OUT_DIR}/swiftshader/*.so ${D}${libdir}/swiftshader
+    # install -v -m 0644 ${OUT_DIR}/swiftshader/*.so ${D}${libdir}/swiftshader
 
     cp -R --no-dereference --preserve=mode,links -v ${OUT_DIR}/image/${includedir}/${BPN}/* ${D}${includedir}/${BPN}/
     install -v -m 0644 ${OUT_DIR}/image/${libdir}/*.so ${D}${libdir}
@@ -282,56 +244,23 @@ install_webruntime() {
     chown root:root -R ${D}${libdir}
     chown root:root -R ${D}${includedir}
     chown root:root -R ${D}${CBE_DATA_LOCALES_PATH}
-
-    # move this to separate mksnapshot-cross recipe once we figure out how to build just cross mksnapshot from chromium repository
-    install -d ${D}${base_bindir}
-    gzip -c ${OUT_DIR}/${MKSNAPSHOT_PATH}mksnapshot > ${D}${base_bindir}/${HOST_SYS}-mksnapshot.gz
-
 }
 
 do_install() {
     install_webruntime
-    install_chromium_browser
 }
 
-WEBOS_SYSTEM_BUS_DIRS_LEGACY_BROWSER_APPLICATION = " \
-    ${webos_sysbus_prvservicesdir}/${BROWSER_APPLICATION}.service \
-    ${webos_sysbus_pubservicesdir}/${BROWSER_APPLICATION}.service \
-    ${webos_sysbus_prvrolesdir}/${BROWSER_APPLICATION}.json \
-    ${webos_sysbus_pubrolesdir}/${BROWSER_APPLICATION}.json \
-"
-
 SYSROOT_DIRS:append = " ${bindir_cross}"
 
-PACKAGES:prepend = " \
-    ${PN}-cross-mksnapshot \
-    ${BROWSER_APPLICATION} \
-"
-
-FILES:${BROWSER_APPLICATION} += " \
-    ${BROWSER_APPLICATION_DIR} \
-    ${WEBOS_SYSTEM_BUS_DIRS_LEGACY_BROWSER_APPLICATION} \
-"
-
-RDEPENDS:${BROWSER_APPLICATION} += "${PN}"
-
 VIRTUAL-RUNTIME_gpu-libs ?= ""
 RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_gpu-libs}"
 
-# The text relocations are intentional -- see comments in [GF-52468]
-# TODO: check if we need INSANE_SKIP on ldflags
-INSANE_SKIP:${BROWSER_APPLICATION} += "libdir ldflags textrel"
-
 FILES:${PN} = " \
     ${libdir}/*.so \
-    ${libdir}/swiftshader/*.so \
     ${CBE_DATA_PATH}/* \
     ${libdir}/${BPN}/*.so \
-    ${WEBOS_SYSTEM_BUS_DIRS} \
 "
 
 FILES:${PN}-dev = " \
     ${includedir} \
 "
-
-FILES:${PN}-cross-mksnapshot = "${bindir_cross}/${HOST_SYS}-mksnapshot.gz"