From c03bdf9ae96ce12aedd0fee021782344a757fa68 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 26 Nov 2015 11:12:24 +0100 Subject: [PATCH] Roll chromium_revision aa8e58a..664fe1e (361601:361806) webrtc/modules/audio_device/android/ensure_initialized.cc needed to be updated due to https://codereview.chromium.org/1407233017 Change log: https://chromium.googlesource.com/chromium/src/+log/aa8e58a..664fe1e Full diff: https://chromium.googlesource.com/chromium/src/+/aa8e58a..664fe1e No dependencies changed. No update to Clang. NOTRY=True CQ_EXTRA_TRYBOTS=tryserver.webrtc:win_baremetal,mac_baremetal,linux_baremetal R=henrika@webrtc.org Review URL: https://codereview.webrtc.org/1482443003 . Cr-Commit-Position: refs/heads/master@{#10798} --- DEPS | 2 +- webrtc/modules/audio_device/android/ensure_initialized.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 71db592c90..ea4b9da6b8 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': 'aa8e58a3274d31c25d15f909a2a9190149856b9b', + 'chromium_revision': '664fe1ed1c1f42cec4b13c99e17b2ddf314f4e7c', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc index 11b2b25e13..b63aec1f27 100644 --- a/webrtc/modules/audio_device/android/ensure_initialized.cc +++ b/webrtc/modules/audio_device/android/ensure_initialized.cc @@ -14,6 +14,7 @@ // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. +#include "base/android/context_utils.h" #include "base/android/jni_android.h" #include "webrtc/base/checks.h" #include "webrtc/modules/audio_device/android/audio_record_jni.h"