Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: media/base/media_stub.cc

Issue 13467037: Android: Fix media and content unittests on Android debug bots (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698