ose: Add webruntime_87=6-r48.0,v87.0.4280.88 wam=r39 Add mksnapshot-c…

…ross_87=r0 :Release Notes: Add chromium87 and related changes :Detailed Notes: webruntime_87: ..submissions/6 Add chromium87 and related changes (Refer to CCC ticket for details) webruntime: r47..r48 Remove unused argument wam: r38..r39 Added runtime flags also to Chromium87 mksnapshot-cross_87: r0 Base recipe for mksnapshot of Chromium87 :Testing Performed: CCC testing :QA Notes: :Issues Addressed: [PLAT-120352] Prepare OSE/Auto build [WRN-2336] CCC: Switch OSE to chromium87 as default webruntime Change-Id: Ia200301e94802fb604c4f377e20ba3c17d734088
webosose · Aug 5, 2021 · 4e3aff6 · 4e3aff6
1 parent f614519
commit 4e3aff6
Show file tree

Hide file tree

Showing 9 changed files with 231 additions and 5 deletions.
diff --git a/meta-webos/recipes-webos/chromium/files/0001-absei-cpp-Fix-build-with-gcc-11.patch b/meta-webos/recipes-webos/chromium/files/0001-absei-cpp-Fix-build-with-gcc-11.patch
@@ -0,0 +1,39 @@
+From f0e4a8dcbe9663255f1aece1fe107c6ec9c09a02 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Mon, 3 May 2021 12:56:57 -0700
+Subject: [PATCH] absei-cpp: Fix build with gcc-11
+
+* fixes:
+http://gecko.lge.com/Errors/Details/165922
+
+FAILED: obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o
+i686-webos-linux-g++  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=TOPDIR/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o.d -DENABLE_BROWSER_CONTROL_WEBAPI=1 -DENABLE_SAMPLE_WEBAPI=1 -DENABLE_MEMORYMANAGER_WEBAPI=1 -DENABLE_NETWORK_ERROR_PAGE_CONTROLLER_WEBAPI=1 -DOZONE_PLATFORM_WAYLAND_EXTERNAL=1 -DOS_WEBOS=1 -DNEVA_VIDEO_HOLE=1 -DUSE_NEVA_APPRUNTIME=1 -DENABLE_WEBM_VIDEO_CODECS=1 -DUSE_CBE=1 -DUSE_PMLOG=1 -DUSE_NEVA_SUSPEND_MEDIA_CAPTURE=1 -DUSE_FILESCHEME_CODECACHE=1 -DUSE_LOCAL_STORAGE_MANAGER=1 -DWEBOS_SUBMISSION_NUMBER=16 -DUSE_LTTNG=1 -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DCR_SYSROOT_HASH=d967bcef40477dbc39acef141ff22bf73f3e7cdb -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -I../../git/src/neva -Igen/neva -I../../git/src -Igen -I../../git/src/third_party/abseil-cpp -Wno-unused-variable -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pipe -pthread -m32 -msse2 -mfpmath=sse -mmmx -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comments -Wno-packed-not-aligned -Wno-attributes -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -c ../../git/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc -o obj/third_party/abseil-cpp/absl/synchronization/graphcycles_internal/graphcycles.o
+../../git/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc: In member function 'void absl::synchronization_internal::GraphCycles::RemoveNode(void*)':
+../../git/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:26: error: 'numeric_limits' is not a member of 'std'
+  451 |   if (x->version == std::numeric_limits<uint32_t>::max()) {
+      |                          ^~~~~~~~~~~~~~
+../../git/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:49: error: expected primary-expression before '>' token
+  451 |   if (x->version == std::numeric_limits<uint32_t>::max()) {
+      |                                                 ^
+../../git/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc:451:52: error: '::max' has not been declared; did you mean 'std::max'?
+  451 |   if (x->version == std::numeric_limits<uint32_t>::max()) {
+      |                                                    ^~~
+      |                                                    std::max
+
+Signed-off-by: Martin Jansa <martin.jansa@lge.com>
+---
+ .../abseil-cpp/absl/synchronization/internal/graphcycles.cc      | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+index 19f9aab5b1..ab9d7f80bc 100644
+--- a/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
++++ b/src/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+@@ -36,6 +36,7 @@
+ #include "absl/synchronization/internal/graphcycles.h"
+
+ #include <algorithm>
++#include <limits>
+ #include <array>
+ #include "absl/base/internal/hide_ptr.h"
+ #include "absl/base/internal/raw_logging.h"
diff --git a/meta-webos/recipes-webos/chromium/files/0002-perfetto-Fix-build-with-gcc-11.patch b/meta-webos/recipes-webos/chromium/files/0002-perfetto-Fix-build-with-gcc-11.patch
@@ -0,0 +1,43 @@
+From 16ea9f8f20d47665117948e2f1ad9ba48131dfea Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Mon, 3 May 2021 20:00:38 +0000
+Subject: [PATCH] perfetto: Fix build with gcc-11
+
+* fixes:
+FAILED: obj/third_party/perfetto/src/trace_processor/db/lib/column.o
+i686-webos-linux-g++  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/
+recipe-sysroot -MMD -MF obj/third_party/perfetto/src/trace_processor/db/lib/column.o.d -DENABLE_BROWSER_CONTROL_WEBAPI=1 -DENABLE_SAMPLE_WEBAPI=1 -DENABLE_MEMORYMANAGER_WEBAPI=1 -DENABLE_NETWORK_ERROR_PAGE_CONTROLLER_WEBAPI=1 -DOZONE_PLATFORM_WAYLAND_EXTERNAL=1 -DOS_WEBOS=1 -DNEVA_VIDEO_HO
+LE=1 -DUSE_NEVA_APPRUNTIME=1 -DENABLE_WEBM_VIDEO_CODECS=1 -DUSE_CBE=1 -DUSE_PMLOG=1 -DUSE_NEVA_SUSPEND_MEDIA_CAPTURE=1 -DUSE_FILESCHEME_CODECACHE=1 -DUSE_LOCAL_STORAGE_MANAGER=1 -DWEBOS_SUBMISSION_NUMBER=16 -DUSE_LTTNG=1 -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1
+-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -DCR_SYSROOT_HASH=d967bcef40477dbc39acef141ff22bf73f3e7cdb -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DPERFETTO_IMPLEMENTATION -I../../git/src/nev
+a -Igen/neva -I../../git/src -Igen -I../../git/src/third_party/perfetto -I../../git/src/third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Wno-unused-variable -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPI
+C -pipe -pthread -m32 -msse2 -mfpmath=sse -mmmx -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -Wall -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comments -Wno-packed-not-aligned -Wno-attributes -Wno-missing-field-initializers
+ -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -fno-exceptions -fno-rtti --sysroot=../../recipe-sysroot -fvisibility-inlines-hidden -c ../../git/src/third_party/perfe
+tto/src/trace_processor/db/column.cc -o obj/third_party/perfetto/src/trace_processor/db/lib/column.o
+In file included from ../../git/src/third_party/perfetto/src/trace_processor/db/column.h:22,
+                 from ../../git/src/third_party/perfetto/src/trace_processor/db/column.cc:17:
+../../git/src/third_party/perfetto/src/trace_processor/containers/string_pool.h: In static member function 'static const uint8_t* perfetto::trace_processor::StringPool::ReadSize(const uint8_t*, uint32_t*)':
+../../git/src/third_party/perfetto/src/trace_processor/containers/string_pool.h:256:34: error: 'numeric_limits' is not a member of 'std'
+  256 |     PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max());
+      |                                  ^~~~~~~~~~~~~~
+../../git/src/third_party/perfetto/src/trace_processor/containers/string_pool.h:256:57: error: expected primary-expression before '>' token
+  256 |     PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max());
+      |                                                         ^
+../../git/src/third_party/perfetto/src/trace_processor/containers/string_pool.h:256:60: error: '::max' has not been declared; did you mean 'std::max'?
+  256 |     PERFETTO_DCHECK(value < std::numeric_limits<uint32_t>::max());
+      |                                                            ^~~
+---
+ .../perfetto/src/trace_processor/containers/string_pool.h        | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/third_party/perfetto/src/trace_processor/containers/string_pool.h b/src/third_party/perfetto/src/trace_processor/containers/string_pool.h
+index 11ae91cfec..558ff00e8f 100644
+--- a/src/third_party/perfetto/src/trace_processor/containers/string_pool.h
++++ b/src/third_party/perfetto/src/trace_processor/containers/string_pool.h
+@@ -20,6 +20,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
++#include <limits>
+ #include <unordered_map>
+ #include <vector>
+
diff --git a/meta-webos/recipes-webos/chromium/files/0003-net-Fix-build-with-gcc-11.patch b/meta-webos/recipes-webos/chromium/files/0003-net-Fix-build-with-gcc-11.patch
@@ -0,0 +1,36 @@
+From 73123d8b1a775f19bf4a0062d3889ea1ff92409a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Mon, 3 May 2021 20:10:09 +0000
+Subject: [PATCH] net: Fix build with gcc-11
+
+* fixes:
+FAILED: obj/net/dns/dns/dns_server_iterator.o
+i686-webos-linux-g++  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security  --sysroot=/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot -MMD -MF obj/net/dns/dns/dns_server_iterator.o.d -DENABLE_BROWSER_CONTROL_WEBAPI=1 -DENABLE_SAMPLE_WEBAPI=1 -DENABLE_MEMORYMANAGER_WEBAPI=1 -DENABLE_NETWORK_ERROR_PAGE_CONTROLLER_WEBAPI=1 -DOZONE_PLATFORM_WAYLAND_EXTERNAL=1 -DOS_WEBOS=1 -DNEVA_VIDEO_HOLE=1 -DUSE_NEVA_APPRUNTIME=1 -DENABLE_WEBM_VIDEO_CODECS=1 -DUSE_CBE=1 -DUSE_PMLOG=1 -DUSE_NEVA_SUSPEND_MEDIA_CAPTURE=1 -DUSE_FILESCHEME_CODECACHE=1 -DUSE_LOCAL_STORAGE_MANAGER=1 -DWEBOS_SUBMISSION_NUMBER=16 -DUSE_LTTNG=1 -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -DCR_SYSROOT_HASH=d967bcef40477dbc39acef141ff22bf73f3e7cdb -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DUSE_LTTNG=1 -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DNET_IMPLEMENTATION -DENABLE_BUILT_IN_DNS -DUSE_GIO -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_ENABLE_TRACING=1 -DU_ENABLE_RESOURCE_TRACING=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -I../../git/src/neva -Igen/neva -I../../git/src -Igen -I../../git/src/third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -I../../git/src/third_party/protobuf/src -Igen/protoc_out -I../../git/src/third_party/protobuf/src -I../../git/src/third_party/abseil-cpp -I../../git/src/third_party/boringssl/src/include -I../../git/src/third_party/zlib -I../../git/src/third_party/ced/src -I../../git/src/third_party/icu/source/common -I../../git/src/third_party/icu/source/i18n -I../../git/src/third_party/brotli/include -Wno-unused-variable -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -funwind-tables -fPIC -pipe -pthread -m32 -msse2 -mfpmath=sse -mmmx -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -Wall -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-comments -Wno-packed-not-aligned -Wno-attributes -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g0 -fvisibility=hidden -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/glib-2.0 -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/lib/glib-2.0/include -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/nss3 -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/nspr -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/libmount -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/blkid -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/include/glib-2.0 -I/jenkins/mjansa/build/webos-pro/honister/BUILD/work/qemux86-webos-linux/webruntime/87.0.4280.88-16-r47.2/recipe-sysroot/usr/lib/glib-2.0/include -std=gnu++14 -Wno-narrowing -Wno-class-memaccess -fno-exceptions -fno-rtti --sysroot=../../recipe-sysroot -fvisibility-inlines-hidden -c ../../git/src/net/dns/dns_server_iterator.cc -o obj/net/dns/dns/dns_server_iterator.o
+In file included from ../../git/src/net/dns/dns_server_iterator.cc:5:
+../../git/src/net/dns/dns_server_iterator.h:31:27: error: expected ')' before 'nameservers_size'
+   31 |   DnsServerIterator(size_t nameservers_size,
+      |                    ~      ^~~~~~~~~~~~~~~~~
+      |                           )
+../../git/src/net/dns/dns_server_iterator.h:47:11: error: 'size_t' does not name a type
+   47 |   virtual size_t GetNextAttemptIndex() = 0;
+      |           ^~~~~~
+../../git/src/net/dns/dns_server_iterator.h:12:1: note: 'size_t' is defined in header '<cstddef>'; did you forget to '#include <cstddef>'?
+   11 | #include "net/dns/public/secure_dns_mode.h"
+  +++ |+#include <cstddef>
+   12 |
+---
+ src/net/dns/dns_server_iterator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/net/dns/dns_server_iterator.h b/src/net/dns/dns_server_iterator.h
+index 97c42f7300..3faf289c1e 100644
+--- a/src/net/dns/dns_server_iterator.h
++++ b/src/net/dns/dns_server_iterator.h
+@@ -6,6 +6,7 @@
+ #define NET_DNS_DNS_SERVER_ITERATOR_H_
+
+ #include <vector>
++#include <cstddef>
+
+ #include "net/base/net_export.h"
+ #include "net/dns/public/secure_dns_mode.h"
diff --git a/meta-webos/recipes-webos/chromium/mksnapshot-cross_87.bb b/meta-webos/recipes-webos/chromium/mksnapshot-cross_87.bb
@@ -0,0 +1,46 @@
+# Copyright (c) 2021 LG Electronics, Inc.
+
+inherit cross
+
+WEBRUNTIME_REPO_VERSION = "87"
+require webruntime-common.inc
+require webruntime-repo${REPO_VERSION}.inc
+
+# Intentionaly disable uninative it failed to execute x86 binary on x64 host
+# 32bit executable mksnapshot is required to create snapshot for the 32bit target
+UNINATIVE_LOADER = ""
+
+PROVIDES = "mksnapshot-cross-${TARGET_ARCH}"
+PN = "mksnapshot-cross-${TARGET_ARCH}"
+BPN = "mksnapshot"
+PR = "r0"
+
+TARGET = "v8_snapshot_clang_${TARGET_CPU}/mksnapshot"
+
+DEPENDS = "glib-2.0-native python-native gcc-runtime"
+
+SRC_URI_append = " \
+file://0001-op-ds-build-Added-mksnapshot.gn-for-mksnapshot-targe.patch \
+"
+
+GN_ARGS_append = "\
+    use_pmlog=false \
+"
+
+do_configure() {
+    export GYP_CHROMIUM_NO_ACTION=1
+    export PATH="${S}/depot_tools:$PATH"
+
+    GN_ARGS="${GN_ARGS}"
+    echo GN_ARGS is ${GN_ARGS}
+    echo BUILD_TARGETS are ${TARGET}
+    cd ${S}/src
+    gn --root=${S}/src --dotfile=mksnapshot.gn gen ${OUT_DIR} --args="${GN_ARGS}"
+}
+
+do_install() {
+    echo "Installing ${PN}"
+    install -d ${D}${bindir}
+
+    install ${OUT_DIR}/v8_snapshot_clang_${TARGET_CPU}/mksnapshot ${D}${bindir}/mksnapshot-cross-${TARGET_ARCH}
+}
diff --git a/meta-webos/recipes-webos/chromium/webruntime-common.inc b/meta-webos/recipes-webos/chromium/webruntime-common.inc
@@ -34,7 +34,6 @@ inherit webos_prerelease_dep
 inherit pythonnative
 
 REPO_VERSION := "${@['','_${WEBRUNTIME_REPO_VERSION}'][d.getVar('WEBRUNTIME_REPO_VERSION').strip() != '']}"
-require webruntime-repo${REPO_VERSION}.inc
 
 WEBOS_REPO_NAME ?= "chromium84"
 WEBOS_GIT_PARAM_BRANCH_V8 ?= "@chromium84"
@@ -98,6 +97,11 @@ GN_ARGS = "\
 EXTRA_OEGN_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'use_gold=true', 'use_gold=false', d)}"
 GN_ARGS += "${EXTRA_OEGN_GOLD}"
 
+# The last digits in the submission format are used for typical submissions number.
+# The submission formats; submissions/[number] or submissions/[branch name].[number]
+WEBOS_SUBMISSION_NUMBER="${@ '${WEBOS_SUBMISSION}'.split('.')[-1] }"
+GN_ARGS_append = " webos_submission_number=${WEBOS_SUBMISSION_NUMBER}"
+
 TARGET_CPU = "${@gn_arch_name(TARGET_ARCH)}"
 GN_ARGS_append = " target_cpu=\"${TARGET_CPU}\""
 

diff --git a/meta-webos/recipes-webos/chromium/webruntime-repo_87.inc b/meta-webos/recipes-webos/chromium/webruntime-repo_87.inc
@@ -0,0 +1,18 @@
+# Copyright (c) 2021 LG Electronics, Inc.
+
+LIC_FILES_CHKSUM += "file://oss-pkg-info.yaml;md5=28f5b870e5e06b9af5b96c9dd65b31c8"
+
+WEBOS_REPO_NAME = "chromium87"
+WEBOS_VERSION = "87.0.4280.88-6_b8ed08cff6808cf7dbacc4b3d2e44c826fdd0861"
+
+WEBOS_REPO_NAME_V8 = "chromium-v8"
+WEBOS_GIT_PARAM_BRANCH_V8 = "@chromium87"
+WEBOS_VERSION_V8 = "8.7.220.29-chromium87.4_e8a7ab899d76b1e8f48457dbb57178d6bd3a4d02"
+SRCREV_v8 = "935065d097cce0090bc858746e6aee0919b222de"
+
+# TODO: Apply all patches from
+SRC_URI += " \
+    file://0001-absei-cpp-Fix-build-with-gcc-11.patch \
+    file://0002-perfetto-Fix-build-with-gcc-11.patch \
+    file://0003-net-Fix-build-with-gcc-11.patch \
+"
diff --git a/meta-webos/recipes-webos/chromium/webruntime.inc b/meta-webos/recipes-webos/chromium/webruntime.inc
@@ -22,7 +22,7 @@ DEPENDS = "virtual/gettext wayland wayland-native luna-service2 pixman freetype
 DEPENDS_remove_raspberrypi4 = " xproto"
 DEPENDS_append_raspberrypi4 = " xorgproto"
 
-INC_PR = "r47"
+INC_PR = "r48"
 # Enable this in webos-local.conf or in recipe to build
 DEPLOY_CHROMEDRIVER ?= "false"
 DEPLOY_WAM_DEMO ?= "false"
@@ -106,7 +106,6 @@ GN_ARGS += "\
 
 # Following options help build with icecc
 GN_ARGS += "\
-    linux_use_bundled_binutils=false\
     use_debug_fission=false\
 "
 

diff --git a/meta-webos/recipes-webos/chromium/webruntime_87.bb b/meta-webos/recipes-webos/chromium/webruntime_87.bb
@@ -0,0 +1,35 @@
+# Copyright (c) 2021 LG Electronics, Inc.
+WEBRUNTIME_REPO_VERSION = "87"
+
+require webruntime.inc
+require webruntime-repo${REPO_VERSION}.inc
+
+PROVIDES = "virtual/webruntime"
+
+PR = "${INC_PR}.0"
+
+GN_ARGS_append = " use_x11=false"
+
+PACKAGECONFIG[debug] = "symbol_level=2,symbol_level=0"
+PACKAGECONFIG[debug-blink] = "blink_symbol_level=1,blink_symbol_level=0"
+
+# Since _remove is always applied LAST, we cannot implement
+# GN_ARGS_remove = "ozone_platform_wayland_external=true" here
+# but thanks gn it overrides former gn args values with later ones
+# so we just add appropriate args to the end of its list:
+PACKAGECONFIG[google_ozone_wayland] = "\
+   ozone_platform_wayland=true ozone_platform_wayland_external=false \
+   use_system_libwayland=true use_wayland_gbm=false use_system_minigbm=false,\
+   ozone_platform_wayland=false ozone_platform_wayland_external=true"
+
+PACKAGECONFIG[v8_lite] = "v8_enable_lite_mode=true,v8_enable_lite_mode=false"
+
+PACKAGECONFIG_remove="jumbo"
+
+GN_ARGS_append = " \
+  libdir=\"${libdir}\"\
+  includedir=\"${includedir}\"\
+  enable_mojom_closure_compile=false\
+  enable_js_type_check=false\
+  use_local_storage_tracker=true\
+"
diff --git a/meta-webos/recipes-webos/wam/wam.bb b/meta-webos/recipes-webos/wam/wam.bb
@@ -20,7 +20,7 @@ VIRTUAL-RUNTIME_cpushareholder ?= "cpushareholder-stub"
 RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_cpushareholder}"
 
 WEBOS_VERSION = "1.0.2-51_aa61db4d5d16060fc50018b9d0c56252259837c5"
-PR = "r38"
+PR = "r39"
 
 inherit webos_enhanced_submissions
 inherit webos_system_bus
@@ -114,7 +114,13 @@ do_configure_append() {
        sed -i '/--enable-aggressive-release-policy \\/a\    --enable-webrtc-platform-video-encoder \\' ${B}/webapp-mgr.sh
     fi
 
-    sed -i '/--enable-aggressive-release-policy \\/a\    --local-storage-limit-per-second-level-domain=10 \\' ${B}/webapp-mgr.sh
+    sed -i '/export WAM_MEM_FLAGS=\" \\/a\    --local-storage-limit-per-second-level-domain=10 \\' ${B}/webapp-mgr.sh
+
+    # Extra added for chromium87
+    sed -i '/--ozone-platform/d' ${B}/webapp-mgr.sh
+    sed -i '/export WAM_COMMON_SWITCHES=\" \\/a\    --disable-gpu-vsync \\' ${B}/webapp-mgr.sh
+    sed -i '/export WAM_COMMON_SWITCHES=\" \\/a\    --alsa-input-device=pulse \\' ${B}/webapp-mgr.sh
+    sed -i '/export WAM_COMMON_SWITCHES=\" \\/a\    --enable-accurate-seek \\' ${B}/webapp-mgr.sh
 }
 
 do_configure_append_qemux86() {