Roll chromium_revision 7fa6701bc5..1a73d11e65 (398458:399420)

A fix was needed to make Android tests pass after
https://codereview.chromium.org/2043803003

Another fix was needed for the webrtc_perf_tests.isolate sinc eit was missing
one file.

Change log: 7fa6701bc5..1a73d11e65
Full diff: 7fa6701bc5..1a73d11e65

Changed dependencies:
* src/buildtools: 8dd3c8e39a..099f1da55b
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/0fc7df55c0..171b5403ee
* src/third_party/ffmpeg: 7f03319b9d..bcb8b67b8b
DEPS diff: 7fa6701bc5..1a73d11e65/DEPS

No update to Clang.

TBR=
BUG=webrtc:5990
NOTRY=True

Review-Url: https://codereview.webrtc.org/2074043002
Cr-Commit-Position: refs/heads/master@{#13178}
This commit is contained in:
kjellander 2016-06-16 23:29:30 -07:00 committed by Commit bot
parent d1523ca38f
commit 68208897be
4 changed files with 6 additions and 2 deletions

2
DEPS
View File

@ -6,7 +6,7 @@
vars = {
'extra_gyp_flag': '-Dextra_gyp_flag=0',
'chromium_git': 'https://chromium.googlesource.com',
'chromium_revision': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4',
'chromium_revision': '1a73d11e65f5af4fc946a00ed1a2b7022ed28c64',
}
# NOTE: Use http rather than https; the latter can cause problems for users

View File

@ -13,6 +13,9 @@
mac_sdk_min_build_override = "10.11"
mac_deployment_target_build_override = "10.7"
# Some non-Chromium builds don't support building java targets.
enable_java_templates = true
# Variable that can be used to support multiple build scenarios, like having
# Chromium specific targets in a client project's GN file etc.
build_with_chromium = false

View File

@ -57,7 +57,7 @@ const char* kPathDelimiter = "/";
#endif
#ifdef WEBRTC_ANDROID
const char* kRootDirName = "/sdcard/";
const char* kRootDirName = "/sdcard/chromium_tests_root/";
#else
// The file we're looking for to identify the project root dir.
const char* kProjectRootFileName = "DEPS";

View File

@ -10,6 +10,7 @@
['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', {
'variables': {
'files': [
'<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm',
'<(DEPTH)/resources/foreman_cif.yuv',
'<(DEPTH)/resources/paris_qcif.yuv',
'<(DEPTH)/resources/voice_engine/audio_long16.pcm',