admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 981ff3850e..99c1f4221e (456928:457015)

Browse Source 
MB was updated to accomodate changes in https://codereview.chromium.org/2695963003

Change log: 981ff3850e..99c1f4221e
Full diff: 981ff3850e..99c1f4221e

Changed dependencies:
* src/base: be5cf86ede..6d7c22c4f5
* src/build: 2744073131..e8b5e58534
* src/ios: 65ada1572f..8d1f4a15e6
* src/testing: 3d76f6cb4c..d6eb1e0a11
* src/third_party: 779bb26879..24999c043d
* src/tools: f2d0d63fdc..2ffeda5cdc
DEPS diff: 981ff3850e..99c1f4221e/DEPS

No update to Clang.

TBR=
BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2755433005
Cr-Commit-Position: refs/heads/master@{#17238}
This commit is contained in:
kjellander 2017-03-15 02:31:11 -07:00 committed by Commit bot
parent 23c595adba
commit 9f8a566316
3 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DEPS
View File

@ -2,7 +2,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '981ff3850e661dae2425f4183aeb1dc8c1104d19',
'chromium_revision': '99c1f4221e4374df51ebb65b24be45400dff150a',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -34,19 +34,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' + '@' + 'be5cf86ede298764c88fc897dbdfe9faa39e8833',
Var('chromium_git') + '/chromium/src/base' + '@' + '6d7c22c4f53fc746db5e3ef7d93f977b0a5239c3',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '27440731314c34fdb1db777b33d1f88a595a749c',
Var('chromium_git') + '/chromium/src/build' + '@' + 'e8b5e585342258c50b10d54ac4064eb253f3a639',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'e6b510a9daf822bbe9f922c200c58150803d2fd8',
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + '3d76f6cb4c0a6581b0fa29c61f12ab4aabee8275',
Var('chromium_git') + '/chromium/src/testing' + '@' + 'd6eb1e0a11ab9153272324bf8d5afb4b8060103d',
'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' + '@' + '779bb2687962a5dca5f2fe0053c71f200f5312fa',
Var('chromium_git') + '/chromium/src/third_party' + '@' + '24999c043d669471ac573ec7dc2ca7b8ca91e53a',
'src/third_party/boringssl/src':
Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'),
'src/third_party/catapult':
@ -79,7 +79,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' + '@' + 'f2d0d63fdcf56e03c788cce8d72e42ebd4febdd8',
Var('chromium_git') + '/chromium/src/tools' + '@' + '2ffeda5cdcce0342a6c5a13f888a11ff050fd5b7',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563',
'src/tools/swarming_client':
@ -119,7 +119,7 @@ deps_os = {
},
'ios': {
'src/ios':
Var('chromium_git') + '/chromium/src/ios' + '@' + '65ada1572f78f1526bd198fbcf999f5d0d23ad23',
Var('chromium_git') + '/chromium/src/ios' + '@' + '8d1f4a15e6c079d5f6fba1e6a07dae06d6066123',
},
'unix': {
'src/third_party/lss':

20
tools-webrtc/mb/mb.py
View File

@ -1055,23 +1055,9 @@ class MetaBuildWrapper(object):
extra_files = []
if android:
logdog_command = [
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
]
test_cmdline = [
self.PathJoin('bin', 'run_%s' % target),
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
]
if test_type != 'junit_test':
test_cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}',]
cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
+ logdog_command + test_cmdline + ['-v'])
cmdline = ['./../../build/android/test_wrapper/logdog_wrapper.py',
'--target', target,
'--logdog-bin-cmd', '../../bin/logdog_butler']
else:
extra_files = ['../../testing/test_env.py']

25
tools-webrtc/mb/mb_unittest.py
View File

@ -379,17 +379,8 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
'./../../build/android/test_wrapper/logdog_wrapper.py',
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
'bin/run_base_unittests',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'--target-devices-file', '${SWARMING_BOT_FILE}',
'-v',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
])
def test_gn_gen_swarming_android_junit_test(self):
@ -419,16 +410,8 @@ class UnitTest(unittest.TestCase):
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
'./../../build/android/test_wrapper/logdog_wrapper.py',
'--logdog-bin-cmd', './../../bin/logdog_butler',
'--project', 'chromium',
'--service-account-json',
'/creds/service_accounts/service-account-luci-logdog-publisher.json',
'--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
'--source', '${ISOLATED_OUTDIR}/logcats',
'--name', 'unified_logcats',
'bin/run_base_unittests',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'-v',
'--target', 'base_unittests',
'--logdog-bin-cmd', '../../bin/logdog_butler',
])
def test_gn_gen_non_parallel_console_test_launcher(self):