Roll chromium_revision a28d8d5..5482f56 (346100:347609)
Recent changes (https://codereview.chromium.org/1311013010) introduces a
dependency on WebKit (Blink) in Chromium, which forces us to start pulling
down that as well (+6GB). However Blink is about to be merged into the
Chromium repo soon anyway, so the size increase is inevitable.
Luckily, this can be removed in the next roll, if we roll past
http://crrev.com/348812
The ijar dependency was introduced in https://codereview.chromium.org/1323053003 (#347208)
Relevant changes:
* src/third_party/boringssl/src: 12fe1b2..ac8302a
* src/third_party/libvpx: a208eca..0304cef
* src/third_party/libyuv: 3c4f573..0bc626a
* src/tools/gyp: 6ee91ad..5d01a8c
Details: https://chromium.googlesource.com/chromium/src/+/a28d8d5..5482f56/DEPS
Clang version was not updated in this roll.
R=torbjorng@webrtc.org
TBR=marpan@webrtc.org
BUG=webrtc:5005, chromium:530112
Review URL: https://codereview.webrtc.org/1305043008 .
Cr-Commit-Position: refs/heads/master@{#9956}
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
index 2fec37c..eb70c4c 100755
--- a/webrtc/build/android/test_runner.py
+++ b/webrtc/build/android/test_runner.py
@@ -26,31 +26,12 @@
import test_runner # pylint: disable=W0406
-from pylib.gtest import gtest_config
-from pylib.gtest import setup
+from pylib.gtest import gtest_test_instance
def main():
- # Override the stable test suites with the WebRTC tests.
- gtest_config.STABLE_TEST_SUITES = [
- 'audio_decoder_unittests',
- 'common_audio_unittests',
- 'common_video_unittests',
- 'modules_tests',
- 'modules_unittests',
- 'rtc_unittests',
- 'system_wrappers_unittests',
- 'test_support_unittests',
- 'tools_unittests',
- 'video_capture_tests',
- 'video_engine_tests',
- 'video_engine_core_unittests',
- 'voice_engine_unittests',
- 'webrtc_perf_tests',
- ]
- gtest_config.EXPERIMENTAL_TEST_SUITES = []
-
# Set our own paths to the .isolate files.
- setup.ISOLATE_FILE_PATHS = {
+ # pylint: disable=protected-access
+ gtest_test_instance._DEFAULT_ISOLATE_FILE_PATHS.update({
'audio_decoder_unittests':
'webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate',
'common_audio_unittests':
@@ -72,7 +53,7 @@
'voice_engine_unittests':
'webrtc/voice_engine/voice_engine_unittests.isolate',
'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
- }
+ })
# Override environment variable to make it possible for the scripts to find
# the root directory (our symlinking of the Chromium build toolchain would
# otherwise make them fail to do so).