summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaPlayer.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2019-10-17 08:55:52 -0700
committerMarco Nelissen <marcone@google.com>2019-10-17 11:11:46 -0700
commit5ff1173ab12f331f6e9d59244b0a48ee33e31581 (patch)
treef32803c8e04dea4aad262d0acafda8fb307a6b26 /media/jni/android_media_MediaPlayer.cpp
parentb2f5699e845bac2eff8905d608347ffe1cb90450 (diff)
Move JetPlayer implemention and JNI
The JetPlayer implementation in libmedia was only used by the JetPlayer JNI code in libandroid_runtime. This change moves both implementation and JNI to libmedia_jni. This reduces libandroid_runtime's dependency on libmedia, and results in a net size reduction of the libraries involved. Test: atest JetPlayerTest Change-Id: I028c774fdea167924b064855267254c15f22fddb
Diffstat (limited to 'media/jni/android_media_MediaPlayer.cpp')
-rw-r--r--media/jni/android_media_MediaPlayer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 94299bc8431a..b4fa07bd7420 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -1436,6 +1436,7 @@ static int register_android_media_MediaPlayer(JNIEnv *env)
}
extern int register_android_media_ImageReader(JNIEnv *env);
extern int register_android_media_ImageWriter(JNIEnv *env);
+extern int register_android_media_JetPlayer(JNIEnv *env);
extern int register_android_media_Crypto(JNIEnv *env);
extern int register_android_media_Drm(JNIEnv *env);
extern int register_android_media_Descrambler(JNIEnv *env);
@@ -1474,6 +1475,11 @@ jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
goto bail;
}
+ if (register_android_media_JetPlayer(env) < 0) {
+ ALOGE("ERROR: JetPlayer native registration failed");
+ goto bail;
+ }
+
if (register_android_media_MediaPlayer(env) < 0) {
ALOGE("ERROR: MediaPlayer native registration failed\n");
goto bail;