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: https://chromium.googlesource.com/chromium/src/+/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}
diff --git a/DEPS b/DEPS
index 00ca5cc..621d577 100644
--- a/DEPS
+++ b/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
diff --git a/sync_chromium.py b/sync_chromium.py
index 3f36652..442ddcd 100755
--- a/sync_chromium.py
+++ b/sync_chromium.py
@@ -24,6 +24,7 @@
import argparse
import os
+import shutil
import subprocess
import sys
import textwrap
@@ -105,6 +106,14 @@
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'
diff --git a/talk/build/isolate.gypi b/talk/build/isolate.gypi
index 00c3832..13f3d50 100644
--- a/talk/build/isolate.gypi
+++ b/talk/build/isolate.gypi
@@ -123,9 +123,6 @@
'--extra-variable', 'mac_product_name', '<(mac_product_name)',
],
}],
- ["test_isolation_outdir!=''", {
- 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
- }],
],
},
],
diff --git a/webrtc/build/isolate.gypi b/webrtc/build/isolate.gypi
index 86169fd..75189f8 100644
--- a/webrtc/build/isolate.gypi
+++ b/webrtc/build/isolate.gypi
@@ -104,9 +104,6 @@
'--extra-variable', 'mac_product_name', '<(mac_product_name)',
],
}],
- ["test_isolation_outdir!=''", {
- 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
- }],
],
},
],
