From 234accd8e10d0dfd68e4cf8d32605c8d092c0a30 Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 8 Feb 2017 23:56:43 -0800 Subject: [PATCH] Roll chromium_revision cf2dce6a6d..2019b9e075 (448969:449230) Minor update in WebRtcJniBootTest.java was needed due to a new check in Chromium. Change log: https://chromium.googlesource.com/chromium/src/+log/cf2dce6a6d..2019b9e075 Full diff: https://chromium.googlesource.com/chromium/src/+/cf2dce6a6d..2019b9e075 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/2a741233ff..8cd4b3e177 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/c4b2c5ac66..e62b61f097 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/53837a325a..9cd8c7efcc * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/2d16559171..ce405e1792 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6549709ce7..bb222623f9 * src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/f20052d2ac..5c71aaccc3 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/644b36a36a..a2cff40065 DEPS diff: https://chromium.googlesource.com/chromium/src/+/cf2dce6a6d..2019b9e075/DEPS No update to Clang. TBR=sakal@webrtc.org BUG=None NOTRY=True Review-Url: https://codereview.webrtc.org/2681293002 Cr-Commit-Position: refs/heads/master@{#16504} --- DEPS | 16 ++++++++-------- .../src/org/webrtc/WebRtcJniBootTest.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index fc5a7ad285..6cf8cbc86b 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'cf2dce6a6dcb889081057acdd10448448813bdda', + 'chromium_revision': '2019b9e075c501a4f7fb3a4a05a6f31c0a485468', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -27,7 +27,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': 'f20052d2acdba42cef9fb6e300d573dbcb2898b1', + 'catapult_revision': '5c71aaccc396cfbd0383a2e09d832aa198e5ae0d', # 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,19 +38,19 @@ 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' + '@' + '2a741233fff6323cd27b08d4ce0d93257246e709', + Var('chromium_git') + '/chromium/src/base' + '@' + '8cd4b3e17762111efc63595e8e67694e4ba110a9', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + 'c4b2c5ac665a2804730c523a75ed1cea5249d4df', + Var('chromium_git') + '/chromium/src/build' + '@' + 'e62b61f0979add47e9e19595724be3e69e3fc9a4', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a7cc7a3e21a061975b33dcdcd81a9716ba614c3c', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '2d16559171afecb0803315dbf4c91d912fe8e307', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'ce405e1792d17f230141221030f81df8228d3610', 'src/testing/gtest': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87', 'src/testing/gmock': Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '6549709ce756f2688159ee86dbb18a0b6219a2c1', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'bb222623f9a0bc0c2b18b8d849f0d7a4f47471be', 'src/third_party/boringssl/src': Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'), 'src/third_party/catapult': @@ -85,7 +85,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + '644b36a36adcbb4f0ded7f17342f4cfb9d44d92f', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'a2cff400654e95b6848c4895d6c8a583a25f3374', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563', 'src/tools/swarming_client': @@ -125,7 +125,7 @@ deps_os = { }, 'ios': { 'src/ios': - Var('chromium_git') + '/chromium/src/ios' + '@' + '53837a325a8941df638d2e4843dd48a5392bcccc', + Var('chromium_git') + '/chromium/src/ios' + '@' + '9cd8c7efccfcebe333e0b6bc29a0558262f7a91b', }, 'unix': { 'src/third_party/lss': diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java index adc4e1ebd5..f933815990 100644 --- a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java +++ b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -package org.appspot.apprtc.test; +package org.webrtc; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest;