diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-03 16:01:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-09 15:19:07 +0200 |
| commit | cd61343ceb4a3de8ce16082917a2f197b2481d08 (patch) | |
| tree | ae88767edf6b3dc07b8dcf54c97a779eb2812768 /tools | |
| parent | fc3893ea80296bd17e1797d5caf4479e0be4afd1 (diff) | |
Chromium 81-based adaptations
Change-Id: Ie422b327025da084bc8038c7a0aadee2db801f29
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildscripts/repack_locales.py | 8 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 1 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tools/buildscripts/repack_locales.py b/tools/buildscripts/repack_locales.py index 8f1ae190b..dc4452d94 100755 --- a/tools/buildscripts/repack_locales.py +++ b/tools/buildscripts/repack_locales.py @@ -89,6 +89,12 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'components', 'strings', 'components_%s_strings_%s.pak' % (BRANDING, locale))) + inputs.append(os.path.join(SHARE_INT_DIR, 'services', 'strings', + 'services_strings_%s.pak' % locale)) + + inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'blink', 'public', 'strings, + 'blink_strings_%s.pak' % locale)) + if OS != 'ios': #e.g. '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak' inputs.append(os.path.join(SHARE_INT_DIR, 'content', 'app', 'strings', @@ -107,7 +113,7 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'chrome', 'generated_resources_%s.pak' % locale)) - #e.g. '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak' + #e.g. '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_da.pak' inputs.append(os.path.join(SHARE_INT_DIR, 'chrome', 'chromium_strings_%s.pak' % locale)) diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 8ec0a898e..6edacaca6 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -81,6 +81,7 @@ def isInChromiumBlacklist(file_path): 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/tab_contents/') and not file_path.startswith('chrome/browser/ui/webui/') and not (file_path.startswith('chrome/browser/resources/') and not '/chromeos/' in file_path and diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index b3181db10..7bc88de4c 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,8 +38,8 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '80.0.3987.163' -chromium_branch = '3987' +chromium_version = '81.0.4044.152' +chromium_branch = '4044' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |