zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 915e47250f..e3860bd297 (412201:412289)

Browse Source 
Change log: 915e47250f..e3860bd297
Full diff: 915e47250f..e3860bd297

No dependencies changed.
No update to Clang.

NOTRY=TRUE
TBR=
BUG=webrtc:6219

Review-Url: https://codereview.webrtc.org/2253973002
Cr-Commit-Position: refs/heads/master@{#13809}
This commit is contained in:
magjed
2016-08-18 01:45:45 -07:00
committed by Commit bot
parent 010f092919
commit 235020dba6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

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

2
webrtc/api/test/androidtestinitializer.cc
View File

@ -39,7 +39,7 @@ void EnsureInitializedOnce() {
JNIEnv* jni = ::base::android::AttachCurrentThread();
JavaVM* jvm = NULL;
RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
jobject context = ::base::android::GetApplicationContext();
jobject context = ::base::android::GetApplicationContext().obj();
RTC_CHECK_GE(webrtc_jni::InitGlobalJniVariables(jvm), 0);
RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()";

2
webrtc/modules/audio_device/android/ensure_initialized.cc
View File

@ -31,7 +31,7 @@ void EnsureInitializedOnce() {
JNIEnv* jni = ::base::android::AttachCurrentThread();
JavaVM* jvm = NULL;
RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
jobject context = ::base::android::GetApplicationContext();
jobject context = ::base::android::GetApplicationContext().obj();
// Initialize the Java environment (currently only used by the audio manager).
webrtc::JVM::Initialize(jvm, context);