From d5bffb5125da23718e8098441b4a4269a5cf2f33 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 30 Jan 2018 17:23:41 +0100 Subject: Basic adaptations for 64-based MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I11e2da206e4e59872a38c178f57a5879c1bbf229 Reviewed-by: Michael Brüning --- tools/scripts/git_submodule.py | 4 +++- tools/scripts/init-repository.py | 2 +- tools/scripts/take_snapshot.py | 8 ++++---- tools/scripts/version_resolver.py | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index fcf2af37a..c2f5d9c31 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -81,8 +81,10 @@ class DEPSParser: if len(rev) == 40: # Length of a git shasum submodule.ref = rev + elif len(rev) == 0: + submodule.ref = 'master' else: - sys.exit("Invalid shasum: " + str(rev)) + sys.exit("Invalid shasum: " + str(scope[dep])) submodules.append(submodule) return submodules diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index dc5cdb8ce..a5bef10c3 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -79,8 +79,8 @@ def updateLastChange(): os.chdir(chromium_src) print 'updating LASTCHANGE files' subprocess.call(['python', 'build/util/lastchange.py', '-o', 'build/util/LASTCHANGE']) - subprocess.call(['python', 'build/util/lastchange.py', '-s', 'third_party/WebKit', '-o', 'build/util/LASTCHANGE.blink']) subprocess.call(['python', 'build/util/lastchange.py', '-m', 'SKIA_COMMIT_HASH', '-s', 'third_party/skia', '--header', 'skia/ext/skia_commit_hash.h']) + subprocess.call(['python', 'build/util/lastchange.py', '-m', 'GPU_LISTS_VERSION', '--revision-id-only', '--header', 'gpu/config/gpu_lists_version.h']) os.chdir(currentDir) def initUpstreamSubmodules(): diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index a6274f0aa..0b279f5d3 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -92,18 +92,18 @@ def isInChromiumBlacklist(file_path): 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/custom_handlers/protocol_handler_registry.' in file_path and - not 'browser/custom_handlers/protocol_handler_registry_factory.' in file_path and not 'browser/net/chrome_mojo_proxy_resolver_factory.' 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/protocol_handler.' 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 @@ -319,8 +319,8 @@ def exportChromium(): files = listFilesInCurrentRepository() # Add LASTCHANGE files which are not tracked by git. files.append('build/util/LASTCHANGE') - files.append('build/util/LASTCHANGE.blink') files.append('skia/ext/skia_commit_hash.h') + files.append('gpu/config/gpu_lists_version.h') print 'copying files to ' + third_party_chromium for i in xrange(len(files)): printProgress(i+1, len(files)) diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 7a22765ef..6e2ab7cda 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 = '63.0.3239.117' -chromium_branch = '3239' +chromium_version = '64.0.3282.139' +chromium_branch = '3282' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' -- cgit v1.2.3