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

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

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']