From 5d9b86dff687621cad7cd1a9075d35fc49ed96e1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 13 Feb 2020 14:53:03 +0100 Subject: Update chromium + simplify snapshot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplifies our snapshoting and includes among other files the chrome command-line preference store, which we can use with minor adaptations. Submodule src/3rdparty 07787da4..4ea22135: > Fix build for expanded sources > Merge "Merge remote-tracking branch 'origin/upstream-master' into 79-based" into 79-based > Don't trigger quad blending for opacity > FIXUP: Fix build with gcc 5 > [Backport] Allow restricted clock_nanosleep in Linux sandbox Change-Id: Ibdf7b24c0fbe920edd61f550913dca02ed67cd20 Reviewed-by: Jüri Valdmann --- tools/scripts/take_snapshot.py | 52 +++++++++++++++------------------------ tools/scripts/version_resolver.py | 2 +- 2 files changed, 21 insertions(+), 33 deletions(-) (limited to 'tools') diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 756c10079..dffdcbc11 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -68,41 +68,29 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('buildtools/third_party/libunwind') or (file_path.startswith('chrome/') and not file_path.startswith('chrome/VERSION') and + not file_path.startswith('chrome/app/resources/') and + not file_path.startswith('chrome/app/theme/') and not file_path.startswith('chrome/browser/chrome_notification_types.h') and - not '/app/theme/' in file_path and - not '/app/resources/' in file_path and - not '/browser/printing/' in file_path and - not ('/browser/resources/' in file_path and not '/chromeos/' in file_path) and - not '/renderer/resources/' in file_path and - not 'repack_locales' in file_path and - not 'third_party/chromevox' in file_path and - not 'media/webrtc/desktop_media_list.h' in file_path and - not 'media/webrtc/desktop_streams_registry.' in file_path and - not 'browser/net/chrome_mojo_proxy_resolver_factory.' in file_path and - not '/browser/accessibility/' in file_path and - not '/browser/custom_handlers/' in file_path and - not '/browser/devtools/' in file_path and - not '/browser/ui/webui/' in file_path and - not 'common/chrome_constants.' in file_path and - not 'common/chrome_paths' in file_path and - not 'common/chrome_switches.' in file_path and - not 'common/content_restriction.h' in file_path and - not 'common/custom_handlers/' in file_path and - not 'common/spellcheck_' in file_path and - not 'common/url_constants.' in file_path and - not 'common/webui_url_constants.' in file_path and - not '/extensions/api/' in file_path and - not '/extensions/browser/api/' in file_path and - not '/extensions/permissions/' in file_path and - not '/renderer_host/pepper/' in file_path and - not '/renderer/pepper/' in file_path and - not '/spellchecker/' in file_path and - not '/tools/convert_dict/' in file_path and - not file_path.endswith('cf_resources.rc') and - not file_path.endswith('version.py') and + not file_path.startswith('chrome/browser/accessibility/') and + not file_path.startswith('chrome/browser/custom_handlers/') and + not file_path.startswith('chrome/browser/devtools/') and + not file_path.startswith('chrome/browser/extensions/api/') and + not file_path.startswith('chrome/browser/media/webrtc/') and + not file_path.startswith('chrome/browser/net/') and + not file_path.startswith('chrome/browser/prefs/') and + not file_path.startswith('chrome/browser/printing/') and + not file_path.startswith('chrome/browser/renderer_host/') and + not file_path.startswith('chrome/browser/spellchecker') and + not file_path.startswith('chrome/browser/ui/webui/') and + not (file_path.startswith('chrome/browser/resources/') and + not '/chromeos/' in file_path and + not '/settings/' in file_path and + not '/mediarouter/' in file_path) and + not (file_path.startswith('chrome/common/') and not file_path.startswith('chrome/common/extensions/docs')) and + not file_path.startswith('chrome/renderer/') and + not file_path.startswith('chrome/tools/convert_dict/') and not file_path.endswith('.grd') and not file_path.endswith('.grdp') and - not file_path.endswith('.json') and not file_path.endswith('chrome_version.rc.version')) or file_path.startswith('chrome_elf') or file_path.startswith('chromecast') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 4aec57051..58d5aa19d 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,7 +38,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '79.0.3945.139' +chromium_version = '79.0.3945.147' chromium_branch = '3945' ninja_version = 'v1.8.2' -- cgit v1.2.1