From 64cf731ce4462aad22e7adf367e43aff9f36ec88 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 22 Feb 2018 10:58:39 +0100 Subject: [PATCH] Roll chromium_revision 2c98648a24..37c4da4be1 (538114:538199) This CL also includes a fix in: webrtc/test/android/AndroidManifest.xml. Change log: https://chromium.googlesource.com/chromium/src/+log/2c98648a24..37c4da4be1 Full diff: https://chromium.googlesource.com/chromium/src/+/2c98648a24..37c4da4be1 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/ed313e8c6c..6afa983e37 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/b734510a01..1e64514e9a * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/d48cc0d3d6..1f2dde49c3 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7e6cab0619..b4bd3e1fde * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/bcdd2c72a7..d5ab621035 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/6a7c1ed24c..3994526859 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/22c4d769bf..0f9e34ac82 DEPS diff: https://chromium.googlesource.com/chromium/src/+/2c98648a24..37c4da4be1/DEPS No update to Clang. TBR=buildbot@webrtc.org,phoglund@webrtc.org BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Forward fixing the Chromium Roll. Change-Id: If36b97067fa43dc13f43e85fca706d0b5526c3d6 Reviewed-on: https://webrtc-review.googlesource.com/56640 Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#22148} --- DEPS | 16 ++++++++-------- test/android/AndroidManifest.xml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index 5646bd2cff..0a8b285c80 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': '2c98648a24e726feb8e4c6e714ec730dbd125286', + 'chromium_revision': '37c4da4be16e50086c75d40142988dad2293dda3', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -28,7 +28,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '6a7c1ed24c1a750c1dc34546e00b7d83f261df72', + 'catapult_revision': '3994526859f1e56267ce0c669c928968fa53078e', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -38,9 +38,9 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + 'ed313e8c6c1598a243c9a51b0aefcf20c1b99c6d', + Var('chromium_git') + '/chromium/src/base' + '@' + '6afa983e37a87aa54511377947b095bf20357cb1', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'b734510a010d4ef1862b40c84b97b9c1d72b4c45', + Var('chromium_git') + '/chromium/src/build' + '@' + '1e64514e9a82a883255bd379bbf6e73c26272061', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '2888931260f2a32bc583f005bd807a561b2fa6af', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -50,13 +50,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'd48cc0d3d6a55df504eb81de68851b4819beff19', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '1f2dde49c301cadeedb6db0f0d1d1d51045ebf5f', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '7e6cab0619a58b53efb62ed33660d22624047aaa', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'b4bd3e1fde2279dd157918dec125dc3c7b436eab', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'bcdd2c72a762a7584029570d0e2fcf808b166142', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd5ab6210352615a084a7868a2643e48ad826d393', 'src/third_party/android_ndk': { 'url': Var('chromium_git') + '/android_ndk.git' + '@' + 'e951c37287c7d8cd915bf8d4149fd4a06d808b55', 'condition': 'checkout_android', @@ -159,7 +159,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '22c4d769bf1e5e99969959a60c791ee4fad81175', + Var('chromium_git') + '/chromium/src/tools' + '@' + '0f9e34ac8242880aa1d9f8c3793de7bd6b93aca2', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml index b5157a75df..f8eb2e500c 100644 --- a/test/android/AndroidManifest.xml +++ b/test/android/AndroidManifest.xml @@ -26,7 +26,7 @@ be found in the AUTHORS file in the root of the source tree. + android:name="org.chromium.native_test.NativeTestApplication">