Skip to content

Commit c03325d

Browse files
committed
chromium: update to 88.0.4324.96
Stable release announcements since our latest update: https://chromereleases.googleblog.com/2021/01/stable-channel-update-for-desktop_19.html Changes: * It's actually not required to set proprietary-codecs and it's up to the user if they want to have them or not. * VA-API is compiled by default since M88. Thus, I had to disable that to avoid pulling libva dependency for chromium x11 and wayland recipes if va-api is not actually needed. Test-built with: * chromium-x11 * dunfell, clang, MACHINE="intel-core2-32" * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="raspberrypi3" * gatesgarth, MACHINE="raspberrypi3" * chromium-ozone-wayland: * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="qemuarm64" * gatesgarth, clang, MACHINE="raspberrypi3" * dunfell, clang, MACHINE="m3ulcb" License Changes --------------- Updated licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE - [WebOTP] Update gms_play_services_auth_api_phone to 17.5.0 - https://chromium-review.googlesource.com/c/chromium/src/+/2485192 * third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE - [WebOTP] Update gms_play_services_auth_api_phone to 17.5.0 - https://chromium-review.googlesource.com/c/chromium/src/+/2485192 * third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE - [WebOTP] Update gms_play_services_auth_api_phone to 17.5.0 - https://chromium-review.googlesource.com/c/chromium/src/+/2485192 * third_party/icu/LICENSE - Roll ICU to fix ListFormat security bug - https://chromium-review.googlesource.com/c/chromium/src/+/2555661 * third_party/woff2/LICENSE - Roll WOFF2 1bccf208bc..a0d0ed7da2 - https://chromium-review.googlesource.com/c/chromium/src/+/2465555 Removed licenses: * chrome/android/third_party/compositor_animator/LICENSE - Migrate CompositorAnimator code to layouts module - https://chromium-review.googlesource.com/c/chromium/src/+/2503830 * third_party/libovr/LICENSE - Remove Oculus VR Runtime and SDK/Lib - https://chromium-review.googlesource.com/c/chromium/src/+/2435722 Added licenses: * chrome/browser/ui/android/layouts/third_party/float_property/LICENSE - Migrate CompositorAnimator code to layouts module - https://chromium-review.googlesource.com/c/chromium/src/+/2503830 * third_party/android_deps/libs/androidx_core_core_animation/LICENSE - Add androidx_core_animation. - https://chromium-review.googlesource.com/c/chromium/src/+/2528122 * third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_design/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_android_support_transition/LICENSE - Android: Use android_deps for play services APIs - https://chromium-review.googlesource.com/1142189 * third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE - Android: Add missing dependencies in android_deps - https://chromium-review.googlesource.com/1208462 * third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE - [Build] Update checkerframework licenses - https://chromium-review.googlesource.com/c/chromium/src/+/2646844 * third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE - Android: Add missing dependencies in android_deps - https://chromium-review.googlesource.com/1208462 * third_party/liburlpattern/LICENSE - Add third_party/liburlpattern directory. - https://chromium-review.googlesource.com/c/chromium/src/+/2486388 * third_party/libx11/LICENSE - Add subsets of libxcb-keysyms, libx11, and x11proto to third_party - https://chromium-review.googlesource.com/c/chromium/src/+/2500268 * third_party/libxcb-keysyms/LICENSE - Add subsets of libxcb-keysyms, libx11, and x11proto to third_party - https://chromium-review.googlesource.com/c/chromium/src/+/2500268 * third_party/subresource-filter-ruleset/LICENSE - Move subresource filter ruleset for perf tests to Google storage - https://chromium-review.googlesource.com/c/chromium/src/+/1959652 * third_party/x11proto/LICENSE - Add subsets of libxcb-keysyms, libx11, and x11proto to third_party - https://chromium-review.googlesource.com/c/chromium/src/+/2500268 Fixes #452
1 parent d9b0cbe commit c03325d

17 files changed

+171
-168
lines changed

recipes-browser/chromium/README

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ PACKAGECONFIG knobs
6767
are desirable on embedded platforms. With this packageconfig, EGL and OpenGL
6868
ES 2.x are used instead.
6969

70-
* use-vaapi: (off by default, chromium-ozone-wayland only)
71-
Enables VA-API support with Ozone/Wayland backend that allows hardware accelerated
72-
media playback on GPUs that support VA-API. Requires proprietary-codecs to be
73-
set. Otherwise, h.264 decoding is not possible.
70+
* use-vaapi: (off by default)
71+
Enables VA-API support with that allows hardware accelerated media playback on
72+
GPUs that support VA-API. If h.264 codec is required, proprietary-codecs must
73+
also be enabled. Please note that not all the possible hardware configs are
74+
tested and supported.
75+
7476

7577
Google API keys
7678
---------------

recipes-browser/chromium/chromium-gn.inc

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ SRC_URI += " \
1616
file://add_internal_define_armv7ve.patch \
1717
file://delete_not_yet_released_clang_warnings.patch \
1818
file://chromium-Move-CharAllocator-definition-to-a-header-f.patch \
19-
file://remove-enable-dse-memoryssa-command-line-flag.patch \
2019
file://0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch \
21-
file://0001-add-missing-cstring-include.patch \
22-
file://0001-drop-dep-on-ui-ozone-for-building-without-ozone.patch \
2320
file://0001-Fix-local-build.patch \
2421
file://0001-IWYU-ui-CursorFactory-is-required-without-Ozone.patch \
2522
file://0001-RandBytes-Stop-including-sys-random.h-on-Linux.patch \
23+
file://0001-Build-fix-for-libstdc.patch \
24+
file://0001-IWYU-add-missing-include-for-std-vector-and-std-uniq.patch \
25+
file://0001-ozone-fix-include.patch \
2626
"
2727

2828
SRC_URI_append_libc-musl = "\
@@ -117,6 +117,13 @@ PACKAGECONFIG[proprietary-codecs] = ' \
117117
ffmpeg_branding="Chromium" proprietary_codecs=false \
118118
'
119119

120+
# Disable VA-API by default. It is compile time enabled since M88, but it's not
121+
# desired to make all the users of the Chromium meta-browser recipe depend on
122+
# libva without a real need. Both X11 (non-Ozone) and Wayland (Ozone) can use it,
123+
# but remember to also use proprietary codecs so that H.264 is supported. Also note
124+
# that not all the hardware configs might be supported.
125+
PACKAGECONFIG[use-vaapi] = "use_vaapi=true,use_vaapi=false,libva"
126+
120127
# Base GN arguments, mostly related to features we want to enable or disable.
121128
GN_ARGS = " \
122129
${PACKAGECONFIG_CONFARGS} \

recipes-browser/chromium/chromium-ozone-wayland_87.0.4280.141.bb renamed to recipes-browser/chromium/chromium-ozone-wayland_88.0.4324.96.bb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ SRC_URI += "\
1414
file://0001-ozone-add-va-api-support-to-wayland.patch \
1515
"
1616

17-
# Enables VA-API for Ozone/Wayland. Remember to also use proprietary codecs
18-
# (see chromium-gn.inc).
19-
PACKAGECONFIG[use-vaapi] = "use_vaapi=true,use_vaapi=false,libva"
20-
2117
GN_ARGS += "\
2218
${PACKAGECONFIG_CONFARGS} \
2319
use_ozone=true \
@@ -44,10 +40,3 @@ GN_ARGS += "use_x11=false"
4440
# The chromium binary must always be started with those arguments.
4541
CHROMIUM_EXTRA_ARGS_append = " --ozone-platform=wayland"
4642

47-
addtask do_check_config before do_configure
48-
49-
python do_check_config() {
50-
if bb.utils.contains('PACKAGECONFIG', 'use-vaapi', True, False, d) and \
51-
not bb.utils.contains('PACKAGECONFIG', 'proprietary-codecs', True, False, d):
52-
bb.fatal("use-vaapi requires the proprietary-codecs option to be set")
53-
}

recipes-browser/chromium/chromium.inc

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[md5sum] = "53a595e1512bbadfde98dd334f28ce26"
8-
SRC_URI[sha256sum] = "147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375"
7+
SRC_URI[md5sum] = "81d5599274ae27996a9e0f6429239178"
8+
SRC_URI[sha256sum] = "8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f"
99

1010
S = "${WORKDIR}/chromium-${PV}"
1111

@@ -49,7 +49,7 @@ LIC_FILES_CHKSUM = "\
4949
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
5050
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
5151
file://${S}/buildtools/third_party/libunwind/trunk/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
52-
file://${S}/chrome/android/third_party/compositor_animator/LICENSE;md5=90e2812358f341d6d34df8e852cffc15 \
52+
file://${S}/chrome/browser/ui/android/layouts/third_party/float_property/LICENSE;md5=90e2812358f341d6d34df8e852cffc15 \
5353
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
5454
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
5555
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
@@ -98,6 +98,7 @@ LIC_FILES_CHKSUM = "\
9898
file://${S}/third_party/android_deps/libs/androidx_concurrent_concurrent_futures/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9999
file://${S}/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
100100
file://${S}/third_party/android_deps/libs/androidx_core_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
101+
file://${S}/third_party/android_deps/libs/androidx_core_core_animation/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
101102
file://${S}/third_party/android_deps/libs/androidx_cursoradapter_cursoradapter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
102103
file://${S}/third_party/android_deps/libs/androidx_customview_customview/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
103104
file://${S}/third_party/android_deps/libs/androidx_documentfile_documentfile/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -142,18 +143,23 @@ LIC_FILES_CHKSUM = "\
142143
file://${S}/third_party/android_deps/libs/androidx_viewpager_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
143144
file://${S}/third_party/android_deps/libs/androidx_webkit_webkit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
144145
file://${S}/third_party/android_deps/libs/androidx_window_window/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
146+
file://${S}/third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
147+
file://${S}/third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
145148
file://${S}/third_party/android_deps/libs/com_android_support_asynclayoutinflater/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
149+
file://${S}/third_party/android_deps/libs/com_android_support_cardview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
146150
file://${S}/third_party/android_deps/libs/com_android_support_collections/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
147151
file://${S}/third_party/android_deps/libs/com_android_support_coordinatorlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
148152
file://${S}/third_party/android_deps/libs/com_android_support_cursoradapter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
149153
file://${S}/third_party/android_deps/libs/com_android_support_customview/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
154+
file://${S}/third_party/android_deps/libs/com_android_support_design/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
150155
file://${S}/third_party/android_deps/libs/com_android_support_documentfile/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
151156
file://${S}/third_party/android_deps/libs/com_android_support_drawerlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
152157
file://${S}/third_party/android_deps/libs/com_android_support_interpolator/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
153158
file://${S}/third_party/android_deps/libs/com_android_support_loader/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
154159
file://${S}/third_party/android_deps/libs/com_android_support_localbroadcastmanager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
155160
file://${S}/third_party/android_deps/libs/com_android_support_multidex/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
156161
file://${S}/third_party/android_deps/libs/com_android_support_print/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
162+
file://${S}/third_party/android_deps/libs/com_android_support_recyclerview_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
157163
file://${S}/third_party/android_deps/libs/com_android_support_slidingpanelayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
158164
file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
159165
file://${S}/third_party/android_deps/libs/com_android_support_support_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -162,16 +168,18 @@ LIC_FILES_CHKSUM = "\
162168
file://${S}/third_party/android_deps/libs/com_android_support_support_fragment/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
163169
file://${S}/third_party/android_deps/libs/com_android_support_support_media_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
164170
file://${S}/third_party/android_deps/libs/com_android_support_support_v4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
171+
file://${S}/third_party/android_deps/libs/com_android_support_support_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165172
file://${S}/third_party/android_deps/libs/com_android_support_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
173+
file://${S}/third_party/android_deps/libs/com_android_support_transition/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166174
file://${S}/third_party/android_deps/libs/com_android_support_versionedparcelable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
167175
file://${S}/third_party/android_deps/libs/com_android_support_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
168176
file://${S}/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs/LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f \
169177
file://${S}/third_party/android_deps/libs/com_android_tools_desugar_jdk_libs_configuration/LICENSE;md5=b6cda58008bb60623be55223bfe531b3 \
170178
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
171-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=01e9b0f376bb203a0215915634712a09 \
179+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=fb1c3d71ca3681654ec1604b10fc1ace \
172180
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
173-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
174-
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=a5923809e496d46d8842ab7d8a52621f \
181+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=01e9b0f376bb203a0215915634712a09 \
182+
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=01e9b0f376bb203a0215915634712a09 \
175183
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast/LICENSE;md5=1e61529f08860f8fa1c90bf8af8007ff \
176184
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=6688c3d596b2e35dd1928d1ffdf5a9e2 \
177185
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \
@@ -190,11 +198,14 @@ LIC_FILES_CHKSUM = "\
190198
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
191199
file://${S}/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
192200
file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
201+
file://${S}/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
193202
file://${S}/third_party/android_deps/libs/com_google_guava_failureaccess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
194203
file://${S}/third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
195204
file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
196205
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
197206
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
207+
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=02277660744c7727cbd0342d7ef08ad5 \
208+
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
198209
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
199210
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
200211
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -248,7 +259,7 @@ LIC_FILES_CHKSUM = "\
248259
file://${S}/third_party/hyphenation-patterns/LICENSE;md5=53b217e6f2560833cbb279119065ae61 \
249260
file://${S}/third_party/iaccessible2/LICENSE;md5=43bbd0bfb581347ec10def720000a645 \
250261
file://${S}/third_party/iccjpeg/LICENSE;md5=26834d132689a03abf860f4572705494 \
251-
file://${S}/third_party/icu/LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0 \
262+
file://${S}/third_party/icu/LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0 \
252263
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
253264
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
254265
file://${S}/third_party/jinja2/LICENSE;md5=7baa781602629654eb2f98ebd8487d8c \
@@ -267,18 +278,20 @@ LIC_FILES_CHKSUM = "\
267278
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
268279
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=26d6491346496a57f75f00a78199122e \
269280
file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
270-
file://${S}/third_party/libovr/LICENSE;md5=c7a47d6f0247450a2fae5232772a6024 \
271281
file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
272282
file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \
273283
file://${S}/third_party/libprotobuf-mutator/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
274284
file://${S}/third_party/libsecret/LICENSE;md5=23c2a5e0106b99d75238986559bb5fc6 \
275285
file://${S}/third_party/libsrtp/LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1 \
276286
file://${S}/third_party/libsync/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
277287
file://${S}/third_party/libudev/LICENSE;md5=4fbd65380cdd255951079008b364516c \
288+
file://${S}/third_party/liburlpattern/LICENSE;md5=585b04bdf5d1b0ea43df74fde02984eb \
278289
file://${S}/third_party/libusb/src/COPYING;md5=fbc093901857fcd118f065f900982c24 \
279290
file://${S}/third_party/libvpx/source/libvpx/LICENSE;md5=d5b04755015be901744a78cc30d390d4 \
280291
file://${S}/third_party/libwebm/source/LICENSE.TXT;md5=6e8dee932c26f2dab503abf70c96d8bb \
281292
file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \
293+
file://${S}/third_party/libx11/LICENSE;md5=28a27b3e1a66e95206d5645b787dad69 \
294+
file://${S}/third_party/libxcb-keysyms/LICENSE;md5=5b0382211c6a98f8e4861daa0f3f4322 \
282295
file://${S}/third_party/libxml/src/Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
283296
file://${S}/third_party/libxslt/src/Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 \
284297
file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \
@@ -326,6 +339,7 @@ LIC_FILES_CHKSUM = "\
326339
file://${S}/third_party/speech-dispatcher/COPYING;md5=5828ebb4b7590269a994ed46b0a70df0 \
327340
file://${S}/third_party/spirv-cross/spirv-cross/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
328341
file://${S}/third_party/sqlite/LICENSE;md5=7256769d4613c0af5a72be32ba20ccf7 \
342+
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
329343
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
330344
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
331345
file://${S}/third_party/tcmalloc/LICENSE;md5=8ecc91ee1a2c17333b40126bfa32b7ca \
@@ -346,9 +360,10 @@ LIC_FILES_CHKSUM = "\
346360
file://${S}/third_party/web-animations-js/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
347361
file://${S}/third_party/webrtc/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
348362
file://${S}/third_party/weston/LICENSE;md5=58164c3e354cc1d2f50a79ea98eb2b15 \
349-
file://${S}/third_party/woff2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
363+
file://${S}/third_party/woff2/LICENSE;md5=027c71da9e4664fdf192e6ec615f4d18 \
350364
file://${S}/third_party/wtl/Ms-PL.txt;md5=1d2c3cdd7e748a6bc4213321d9157c5a \
351365
file://${S}/third_party/wuffs/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \
366+
file://${S}/third_party/x11proto/LICENSE;md5=f242876648161c7208413d60498dc20d \
352367
file://${S}/third_party/xdg-utils/LICENSE;md5=a5367a90934098d6b05af3b746405014 \
353368
file://${S}/third_party/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \
354369
file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Upstream-Status: Backport
2+
3+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4+
---
5+
From 3af19c2d82a3fcc197ef12783797294d4f7f9529 Mon Sep 17 00:00:00 2001
6+
From: Hans-Filip Elo <helo@vewd.com>
7+
Date: Thu, 17 Dec 2020 22:34:21 +0000
8+
Subject: [PATCH] Build fix for libstdc++
9+
10+
When building against libstdc++, the macro DCHECK_NE does not seem to
11+
handle implicit conversion between std::unique_ptr and nullptr. This
12+
patch fixes one such build error in compositor_frame_reporter.cc.
13+
14+
Bug: 957519
15+
Change-Id: If1801dba777a90089a4c0585cec7e62de8006fff
16+
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595279
17+
Reviewed-by: danakj <danakj@chromium.org>
18+
Commit-Queue: Hans-Filip Elo <helo@vewd.com>
19+
Cr-Commit-Position: refs/heads/master@{#838269}
20+
---
21+
cc/metrics/compositor_frame_reporter.cc | 2 +-
22+
1 file changed, 1 insertion(+), 1 deletion(-)
23+
24+
diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
25+
index 93d0e2352a78..da04b33d3fdc 100644
26+
--- a/cc/metrics/compositor_frame_reporter.cc
27+
+++ b/cc/metrics/compositor_frame_reporter.cc
28+
@@ -671,7 +671,7 @@ void CompositorFrameReporter::ReportCompositorLatencyHistogram(
29+
30+
void CompositorFrameReporter::ReportEventLatencyHistograms() const {
31+
for (const auto& event_metrics : events_metrics_) {
32+
- DCHECK_NE(event_metrics, nullptr);
33+
+ DCHECK(event_metrics);
34+
const std::string histogram_base_name =
35+
GetEventLatencyHistogramBaseName(*event_metrics);
36+
const int event_type_index = static_cast<int>(event_metrics->type());
37+
--
38+
2.25.1
39+

0 commit comments

Comments
 (0)