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: 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}
This commit is contained in:
Henrik Kjellander
2015-09-16 19:19:04 +02:00
parent 844a91081e
commit eecbab7cd5
7 changed files with 16 additions and 28 deletions

2
.gitignore vendored
View File

@ -99,6 +99,7 @@
/third_party/google-visualization-python /third_party/google-visualization-python
/third_party/icu /third_party/icu
/third_party/instrumented_libraries /third_party/instrumented_libraries
/third_party/ijar
/third_party/jsoncpp /third_party/jsoncpp
/third_party/jsr-305 /third_party/jsr-305
/third_party/junit /third_party/junit
@ -132,6 +133,7 @@
/third_party/syzygy /third_party/syzygy
/third_party/usrsctp /third_party/usrsctp
/third_party/valgrind /third_party/valgrind
/third_party/WebKit
/third_party/winsdk_samples/src /third_party/winsdk_samples/src
/third_party/yasm /third_party/yasm
/third_party/zlib /third_party/zlib

1
.gn
View File

@ -42,5 +42,6 @@ exec_script_whitelist = [
"//build/toolchain/win/BUILD.gn", "//build/toolchain/win/BUILD.gn",
"//third_party/boringssl/BUILD.gn", "//third_party/boringssl/BUILD.gn",
"//third_party/opus/BUILD.gn", "//third_party/opus/BUILD.gn",
"//third_party/WebKit/Source/config.gni",
"//webrtc/modules/video_render/BUILD.gn", "//webrtc/modules/video_render/BUILD.gn",
] ]

2
DEPS
View File

@ -6,7 +6,7 @@
vars = { vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0', 'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': 'a28d8d5a93d2d589bfac8fe77907cba3941b023e', 'chromium_revision': '5482f563e441be7ab1cf59a02e3fd9e010e9535b',
} }
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

View File

@ -17,7 +17,6 @@ solutions = [{
'src/third_party/skia': None, 'src/third_party/skia': None,
'src/third_party/trace-viewer': None, 'src/third_party/trace-viewer': None,
'src/third_party/webrtc': None, 'src/third_party/webrtc': None,
'src/third_party/WebKit': None,
}, },
'safesync_url': '' 'safesync_url': ''
}] }]

View File

@ -62,6 +62,7 @@ DIRECTORIES = [
'third_party/sqlite', 'third_party/sqlite',
'third_party/syzygy', 'third_party/syzygy',
'third_party/usrsctp', 'third_party/usrsctp',
'third_party/WebKit',
'third_party/yasm', 'third_party/yasm',
'third_party/zlib', 'third_party/zlib',
'tools/clang', 'tools/clang',
@ -87,6 +88,7 @@ if 'android' in target_os:
'third_party/android_tools', 'third_party/android_tools',
'third_party/appurify-python', 'third_party/appurify-python',
'third_party/ashmem', 'third_party/ashmem',
'third_party/ijar',
'third_party/jsr-305', 'third_party/jsr-305',
'third_party/junit', 'third_party/junit',
'third_party/libevent', 'third_party/libevent',

View File

@ -799,20 +799,23 @@ TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSConnectWithSmallMtu) {
}; };
// Test transfer -- trivial // Test transfer -- trivial
TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransfer) { // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransfer) {
MAYBE_SKIP_TEST(HaveDtls); MAYBE_SKIP_TEST(HaveDtls);
TestHandshake(); TestHandshake();
TestTransfer(100); TestTransfer(100);
}; };
TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithLoss) { // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithLoss) {
MAYBE_SKIP_TEST(HaveDtls); MAYBE_SKIP_TEST(HaveDtls);
TestHandshake(); TestHandshake();
SetLoss(10); SetLoss(10);
TestTransfer(100); TestTransfer(100);
}; };
TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithDamage) { // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005
TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithDamage) {
MAYBE_SKIP_TEST(HaveDtls); MAYBE_SKIP_TEST(HaveDtls);
SetDamage(); // Must be called first because first packet SetDamage(); // Must be called first because first packet
// write happens at end of handshake. // write happens at end of handshake.

View File

@ -26,31 +26,12 @@ sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
import test_runner # pylint: disable=W0406 import test_runner # pylint: disable=W0406
from pylib.gtest import gtest_config from pylib.gtest import gtest_test_instance
from pylib.gtest import setup
def main(): 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. # 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': 'audio_decoder_unittests':
'webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate', 'webrtc/modules/audio_coding/neteq/audio_decoder_unittests.isolate',
'common_audio_unittests': 'common_audio_unittests':
@ -72,7 +53,7 @@ def main():
'voice_engine_unittests': 'voice_engine_unittests':
'webrtc/voice_engine/voice_engine_unittests.isolate', 'webrtc/voice_engine/voice_engine_unittests.isolate',
'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate', 'webrtc_perf_tests': 'webrtc/webrtc_perf_tests.isolate',
} })
# Override environment variable to make it possible for the scripts to find # Override environment variable to make it possible for the scripts to find
# the root directory (our symlinking of the Chromium build toolchain would # the root directory (our symlinking of the Chromium build toolchain would
# otherwise make them fail to do so). # otherwise make them fail to do so).