91d6edef35
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
45 lines
1.5 KiB
C++
45 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/audio_device/android/ensure_initialized.h"
|
|
|
|
#include <pthread.h>
|
|
|
|
// 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/jni_android.h"
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
|
|
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
|
|
#include "webrtc/modules/utility/interface/jvm_android.h"
|
|
|
|
namespace webrtc {
|
|
namespace audiodevicemodule {
|
|
|
|
static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
|
|
|
|
void EnsureInitializedOnce() {
|
|
RTC_CHECK(::base::android::IsVMInitialized());
|
|
JNIEnv* jni = ::base::android::AttachCurrentThread();
|
|
JavaVM* jvm = NULL;
|
|
RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
|
|
jobject context = ::base::android::GetApplicationContext();
|
|
|
|
// Initialize the Java environment (currently only used by the audio manager).
|
|
webrtc::JVM::Initialize(jvm, context);
|
|
}
|
|
|
|
void EnsureInitialized() {
|
|
RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
|
|
}
|
|
|
|
} // namespace audiodevicemodule
|
|
} // namespace webrtc
|