Roll chromium_revision e937e5f..c2239a8 (333350:334133)
Removed no longer used test_isolation_outdir variable as in
https://codereview.chromium.org/1176463003
The move of a DEPS in https://codereview.chromium.org/1155743013
is causing problems on some trybots. It shouldn't affect developers.
Relevant changes:
* src/third_party/android_tools: a3afc68..ed3dde6
* src/third_party/icu: 9939a5d..a05f412
* src/third_party/libjpeg_turbo: 8ee9bdd..f4631b6
* src/third_party/libyuv: 632c50f..632c50f
Details: e937e5f..c2239a8
/DEPS
Clang version was not updated in this roll.
BUG=
R=pbos@webrtc.org
Review URL: https://codereview.webrtc.org/1182043002.
Cr-Commit-Position: refs/heads/master@{#9435}
This commit is contained in:
parent
2b679250fb
commit
05ce5dd0f1
2
DEPS
2
DEPS
@ -6,7 +6,7 @@
|
||||
vars = {
|
||||
'extra_gyp_flag': '-Dextra_gyp_flag=0',
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
'chromium_revision': 'e937e5fb5e6136ef27280fc7aad5502aa5a3cce2',
|
||||
'chromium_revision': 'c2239a84ca03a01bb95d6055d2a6c75b767979fb',
|
||||
}
|
||||
|
||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
||||
|
@ -24,6 +24,7 @@ incremented. The file can be removed manually to force a new sync.
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import textwrap
|
||||
@ -105,6 +106,14 @@ def main():
|
||||
|
||||
env = os.environ.copy()
|
||||
|
||||
# Workaround to avoid sync failure due move in
|
||||
# https://codereview.chromium.org/1155743013
|
||||
# TODO(kjellander): Remove this after the summer of 2015.
|
||||
freetype_src = os.path.join(CR_DIR, 'src', 'third_party', 'freetype-android',
|
||||
'src')
|
||||
if os.path.isdir(freetype_src):
|
||||
shutil.rmtree(freetype_src)
|
||||
|
||||
# Avoid downloading NaCl toolchain as part of the Chromium hooks.
|
||||
env.setdefault('GYP_DEFINES', '')
|
||||
env['GYP_DEFINES'] += ' disable_nacl=1'
|
||||
|
@ -123,9 +123,6 @@
|
||||
'--extra-variable', 'mac_product_name', '<(mac_product_name)',
|
||||
],
|
||||
}],
|
||||
["test_isolation_outdir!=''", {
|
||||
'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
|
@ -104,9 +104,6 @@
|
||||
'--extra-variable', 'mac_product_name', '<(mac_product_name)',
|
||||
],
|
||||
}],
|
||||
["test_isolation_outdir!=''", {
|
||||
'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
|
Loading…
x
Reference in New Issue
Block a user