diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-08 20:24:42 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-08 20:24:42 +0000 |
| commit | 95051d774a3f4e8266bb75310db5d9e053134a0a (patch) | |
| tree | 0c00931db856f53ce5e400566fdc3a47c4361038 /media | |
| parent | f9ae18e1c51bb60e5602d860f01df2ba18cc3f37 (diff) | |
| download | chromium_src-95051d774a3f4e8266bb75310db5d9e053134a0a.zip chromium_src-95051d774a3f4e8266bb75310db5d9e053134a0a.tar.gz chromium_src-95051d774a3f4e8266bb75310db5d9e053134a0a.tar.bz2 | |
Android: Fix media and content unittests on Android debug bots
BUG=
Review URL: https://codereview.chromium.org/13467037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_stub.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/base/media_stub.cc b/media/base/media_stub.cc index 27bdc15..aadfbd1 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() { |