| Index: media/base/media_stub.cc
|
| diff --git a/media/base/media_stub.cc b/media/base/media_stub.cc
|
| index 27bdc15e2d6be0706c5aa038575223ed3ab952de..aadfbd1150fa96661595ad2f69f5a77644a99629 100644
|
| --- a/media/base/media_stub.cc
|
| +++ b/media/base/media_stub.cc
|
| @@ -6,6 +6,11 @@
|
|
|
| #include "base/logging.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "base/android/jni_android.h"
|
| +#include "media/base/android/media_jni_registrar.h"
|
| +#endif
|
| +
|
| // This file is intended for platforms that don't need to load any media
|
| // libraries (e.g., Android and iOS).
|
| namespace media {
|
| @@ -15,6 +20,11 @@ bool InitializeMediaLibrary(const base::FilePath& module_dir) {
|
| }
|
|
|
| void InitializeMediaLibraryForTesting() {
|
| +#if defined(OS_ANDROID)
|
| + // Register JNI bindings for android.
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + RegisterJni(env);
|
| +#endif
|
| }
|
|
|
| bool IsMediaLibraryInitialized() {
|
|
|