From bfdee69d486e05af5bb9f3e4f68f6c79028eca9e Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 3 Feb 2015 15:23:34 +0000 Subject: [PATCH] Roll chromium_revision 9070a80..cd35af6 (313233:314322) Relevant changes: * src/third_party/boringssl/src: 347f025..be629e0 * src/third_party/libvpx: 5da40ca..5cdd302 * src/third_party/openmax_dl: 8f7bf0b..c01d587 * src/tools/gyp: b28bd7d..4d7c139 * src/tools/swarming_client: d863df3..c698ea2 Details: https://chromium.googlesource.com/chromium/src/+/9070a80..cd35af6/DEPS Clang version was not updated in this roll. webrtc_tests.py had to be updated to match changes in https://codereview.chromium.org/882713002 A workaround for grit resources and the addition of V8 to the Chromium checkout had to be done due to changed dependencies caused by https://codereview.chromium.org/867073002 R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/35969004 Cr-Commit-Position: refs/heads/master@{#8234} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8234 4adac7df-926f-26a2-2b94-8c16560cd09d --- .gitignore | 1 - DEPS | 2 +- chromium/.gclient | 1 - setup_links.py | 1 + sync_chromium.py | 2 +- tools/gritsettings/README | 7 +++++++ tools/gritsettings/resource_ids | 15 +++++++++++++++ tools/valgrind-webrtc/webrtc_tests.py | 6 ++++-- 8 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 tools/gritsettings/README create mode 100644 tools/gritsettings/resource_ids diff --git a/.gitignore b/.gitignore index 463762bca..7d7e70d34 100644 --- a/.gitignore +++ b/.gitignore @@ -119,7 +119,6 @@ /tools/generate_library_loader /tools/gn /tools/grit -/tools/gritsettings /tools/gyp /tools/memory /tools/protoc_wrapper diff --git a/DEPS b/DEPS index 8f6af0554..74e406fd3 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '9070a8059b513108b09d30f96576b5ce11d0857a', + 'chromium_revision': 'cd35af688438dfb0b31fff626cf0ff6ac52fd44f', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/chromium/.gclient b/chromium/.gclient index 494a9c72f..a1ed77780 100644 --- a/chromium/.gclient +++ b/chromium/.gclient @@ -12,7 +12,6 @@ solutions = [{ 'src/third_party/ffmpeg': None, 'src/third_party/junit/src': None, 'src/third_party/WebKit': None, - 'src/v8': None, }, 'safesync_url': '' }] diff --git a/setup_links.py b/setup_links.py index 047e18349..e524bc006 100755 --- a/setup_links.py +++ b/setup_links.py @@ -88,6 +88,7 @@ if 'android' in get_target_os_list(): 'third_party/modp_b64', 'third_party/requests', 'tools/android', + 'tools/grit', 'tools/relocation_packer' ] diff --git a/sync_chromium.py b/sync_chromium.py index 320f3b348..abea33b59 100755 --- a/sync_chromium.py +++ b/sync_chromium.py @@ -29,7 +29,7 @@ import sys # Bump this whenever the algorithm changes and you need bots/devs to re-sync, # ignoring the .last_sync_chromium file -SCRIPT_VERSION = 3 +SCRIPT_VERSION = 4 ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) CHROMIUM_NO_HISTORY = 'CHROMIUM_NO_HISTORY' diff --git a/tools/gritsettings/README b/tools/gritsettings/README new file mode 100644 index 000000000..ca9cb31f7 --- /dev/null +++ b/tools/gritsettings/README @@ -0,0 +1,7 @@ +This is a dummy configuration file to workaround the assumption of the grit +resource file being located here in the Chromium build toolchain. + +This is only needed for our Android native tests to be able to include the +build/apk_test.gypi GYP file and depend on the +<(DEPTH)/testing/android/native_test.gyp:native_test_native_code target in +Chromium. diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids new file mode 100644 index 000000000..bfdfbbe90 --- /dev/null +++ b/tools/gritsettings/resource_ids @@ -0,0 +1,15 @@ +# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +{ + "SRCDIR": "../..", + + "chromium/src/net/base/net_resources.grd": { + "includes": [4000], + }, +} diff --git a/tools/valgrind-webrtc/webrtc_tests.py b/tools/valgrind-webrtc/webrtc_tests.py index c97e2fc5d..aacf49782 100755 --- a/tools/valgrind-webrtc/webrtc_tests.py +++ b/tools/valgrind-webrtc/webrtc_tests.py @@ -117,10 +117,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: