From 68208897bea5638a03ed1db7ff5222a61016ec27 Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 16 Jun 2016 23:29:30 -0700 Subject: [PATCH] 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: https://chromium.googlesource.com/chromium/src/+log/7fa6701bc5..1a73d11e65 Full diff: https://chromium.googlesource.com/chromium/src/+/7fa6701bc5..1a73d11e65 Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/8dd3c8e39a..099f1da55b * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/0fc7df55c0..171b5403ee * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/7f03319b9d..bcb8b67b8b DEPS diff: https://chromium.googlesource.com/chromium/src/+/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} --- DEPS | 2 +- build_overrides/build.gni | 3 +++ webrtc/test/testsupport/fileutils.cc | 2 +- webrtc/webrtc_perf_tests.isolate | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 5708c39bd6..85dfea346d 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': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4', + 'chromium_revision': '1a73d11e65f5af4fc946a00ed1a2b7022ed28c64', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 1088355ef7..da8a1d5e82 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -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 diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc index d99b990918..4bf8c5fa19 100644 --- a/webrtc/test/testsupport/fileutils.cc +++ b/webrtc/test/testsupport/fileutils.cc @@ -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"; diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate index e356839d5e..d29aebb8f3 100644 --- a/webrtc/webrtc_perf_tests.isolate +++ b/webrtc/webrtc_perf_tests.isolate @@ -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',