From 1dc351bf44c31a0a56a7554432660d448c79a446 Mon Sep 17 00:00:00 2001 From: "kjellander@google.com" Date: Fri, 27 Feb 2015 10:20:23 +0000 Subject: [PATCH] Roll chromium_revision 271c6cc..2c3ffb2 (309333:317530) + fixes Details: https://chromium.googlesource.com/chromium/src/+/271c6cc..2c3ffb2/DEPS Updated sync_chromium.py to be identical with WebRTC's current version. Removed the xcode61 suffixed Mac trybots as well. The following were moved into src/buildtools: * src/third_party/libc++/trunk * src/third_party/libc++abi/trunk TBR=fbarchard@google.com TESTED=All trybots passing this. Review URL: https://webrtc-codereview.appspot.com/40119004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1301 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- .gitignore | 3 +- DEPS | 2 +- PRESUBMIT.py | 10 +-- setup_links.py | 2 - sync_chromium.py | 87 ++++++++++++++++++++------- tools/valgrind-libyuv/libyuv_tests.py | 6 +- 6 files changed, 75 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index b79716ecb..336943ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ .gn build buildtools -chromium/.gclient_entries +chromium/.gclient.tmp +chromium/.gclient.tmp_entries chromium/.last_sync_chromium chromium/src/ google_apis diff --git a/DEPS b/DEPS index a774dd8c4..36016bf27 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { # Roll the Chromium Git hash to pick up newer versions of all the # dependencies and tools linked to in setup_links.py. - 'chromium_revision': '271c6cca48a6cef32c0f3add3b17b700707deec5', + 'chromium_revision': '2c3ffb2355a27c32f45e508ef861416b820c823b', } hooks = [ diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 5c2ba9585..09aa8270a 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -34,14 +34,6 @@ def GetPreferredTryMasters(project, change): 'ios_arm64', 'ios_arm64_rel', 'mac_asan', - 'mac_xcode61', - 'mac_rel_xcode61', - 'mac_x64_rel_xcode61', - 'ios_xcode61', - 'ios_rel_xcode61', - 'ios_arm64_xcode61', - 'ios_arm64_rel_xcode61', - 'mac_asan_xcode61', 'linux', 'linux_rel', 'linux_memcheck', @@ -49,6 +41,8 @@ def GetPreferredTryMasters(project, change): 'linux_asan', 'android', 'android_rel', + 'android_clang', + 'android_arm64', ] if not files or all(re.search(r'[\\/]OWNERS$', f) for f in files): return {} diff --git a/setup_links.py b/setup_links.py index 878614fd9..80b6c4d59 100755 --- a/setup_links.py +++ b/setup_links.py @@ -41,8 +41,6 @@ DIRECTORIES = [ 'third_party/android_testrunner', 'third_party/android_tools', 'third_party/binutils', - 'third_party/libc++', - 'third_party/libc++abi', 'third_party/libjpeg', 'third_party/libjpeg_turbo', 'third_party/llvm-build', diff --git a/sync_chromium.py b/sync_chromium.py index 65353c392..53341a78a 100755 --- a/sync_chromium.py +++ b/sync_chromium.py @@ -7,6 +7,21 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +"""Script to download a Chromium checkout into the workspace. + +The script downloads a full Chromium Git clone and its DEPS. + +The following environment variable can be used to alter the behavior: +* CHROMIUM_NO_HISTORY - If set to 1, a Git checkout with no history will be + downloaded. This is consumes less bandwidth and disk space but is known to be + slower in general if you have a high-speed connection. + +After a successful sync has completed, a .last_sync_chromium file is written to +the chromium directory. While it exists, no more gclient sync operations will be +performed until the --target-revision changes or the SCRIPT_VERSION constant is +incremented. The file can be removed manually to force a new sync. +""" + import argparse import os import subprocess @@ -14,20 +29,28 @@ import sys # Bump this whenever the algorithm changes and you need bots/devs to re-sync, # ignoring the .last_sync_chromium file -SCRIPT_VERSION = 1 +SCRIPT_VERSION = 4 ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) +CHROMIUM_NO_HISTORY = 'CHROMIUM_NO_HISTORY' + +def _parse_gclient_dict(): + gclient_dict = {} + try: + main_gclient = os.path.join(os.path.dirname(ROOT_DIR), '.gclient') + with open(main_gclient, 'rb') as deps_content: + exec(deps_content, gclient_dict) + except Exception as e: + print >> sys.stderr, 'error while parsing .gclient:', e + return gclient_dict + + +def get_cache_dir(): + return _parse_gclient_dict().get('cache_dir') def get_target_os_list(): - try: - main_gclient = os.path.join(os.path.dirname(ROOT_DIR), '.gclient') - config_dict = {} - with open(main_gclient, 'rb') as deps_content: - exec(deps_content, config_dict) - return ','.join(config_dict.get('target_os', [])) - except Exception as e: - print >> sys.stderr, "error while parsing .gclient:", e + return ','.join(_parse_gclient_dict().get('target_os', [])) def main(): @@ -52,20 +75,19 @@ def main(): opts.target_revision, repr(target_os_list), ]) - if os.path.exists(flag_file): + if (os.path.exists(os.path.join(opts.chromium_dir, 'src')) and + os.path.exists(flag_file)): with open(flag_file, 'r') as f: if f.read() == flag_file_content: - print "Chromium already up to date:", opts.target_revision + print 'Chromium already up to date: ', opts.target_revision return 0 os.unlink(flag_file) - # To avoid gclient sync problems when DEPS entries have been removed we must - # wipe the .gclient_entries file that contains cached URLs for all DEPS. - entries_file = os.path.join(opts.chromium_dir, '.gclient_entries') - if os.path.exists(entries_file): - os.unlink(entries_file) - env = os.environ.copy() + + # Avoid downloading NaCl toolchain as part of the Chromium hooks. + env.setdefault('GYP_DEFINES', '') + env['GYP_DEFINES'] += ' disable_nacl=1' env['GYP_CHROMIUM_NO_ACTION'] = '1' gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' args = [ @@ -73,6 +95,7 @@ def main(): ] if os.environ.get('CHROME_HEADLESS') == '1': + # Running on a buildbot. args.append('-vvv') if sys.platform.startswith('win'): @@ -80,20 +103,42 @@ def main(): 'b', 'git-cache') else: cache_path = '/b/git-cache' + else: + # Support developers setting the cache_dir in .gclient. + cache_path = get_cache_dir() + # Allow for users with poor internet connections to download a Git clone + # without history (saves several gigs but is generally slower and doesn't work + # with the Git cache). + if os.environ.get(CHROMIUM_NO_HISTORY) == '1': + if cache_path: + print >> sys.stderr, ( + 'You cannot use "no-history" mode for syncing Chrome (i.e. set the ' + '%s environment variable to 1) when you have cache_dir configured in ' + 'your .gclient.' % CHROMIUM_NO_HISTORY) + return 1 + args.append('--no-history') + gclient_entries_file = os.path.join(opts.chromium_dir, '.gclient_entries') + else: + # Write a temporary .gclient file that has the cache_dir variable added. gclientfile = os.path.join(opts.chromium_dir, '.gclient') with open(gclientfile, 'rb') as spec: spec = spec.read().splitlines() spec[-1] = 'cache_dir = %r' % (cache_path,) - with open(gclientfile + '.bot', 'wb') as f: + with open(gclientfile + '.tmp', 'wb') as f: f.write('\n'.join(spec)) args += [ - '--gclientfile', '.gclient.bot', + '--gclientfile', '.gclient.tmp', '--delete_unversioned_trees', '--reset', '--upstream' ] - else: - args.append('--no-history') + gclient_entries_file = os.path.join(opts.chromium_dir, + '.gclient.tmp_entries') + + # To avoid gclient sync problems when DEPS entries have been removed we must + # wipe the gclient's entries file that contains cached URLs for all DEPS. + if os.path.exists(gclient_entries_file): + os.unlink(gclient_entries_file) if target_os_list: args += ['--deps=' + target_os_list] diff --git a/tools/valgrind-libyuv/libyuv_tests.py b/tools/valgrind-libyuv/libyuv_tests.py index 17ea3c142..bd27cd5ca 100755 --- a/tools/valgrind-libyuv/libyuv_tests.py +++ b/tools/valgrind-libyuv/libyuv_tests.py @@ -103,10 +103,12 @@ def main(_): 'instead of /tmp.\nThis can be useful for tool ' 'developers/maintainers.\nPlease note that the ' '.logs directory will be clobbered on tool startup.')) - parser.add_option("--brave-new-test-launcher", action="store_true", - help="run the tests with --brave-new-test-launcher") parser.add_option("--test-launcher-bot-mode", action="store_true", help="run the tests with --test-launcher-bot-mode") + parser.add_option("--test-launcher-total-shards", type=int, + help="run the tests with --test-launcher-total-shards") + parser.add_option("--test-launcher-shard-index", type=int, + help="run the tests with --test-launcher-shard-index") options, args = parser.parse_args() if options.verbose: