diff options
| -rw-r--r-- | media/jni/Android.mk | 12 | ||||
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 5 |
2 files changed, 0 insertions, 17 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index 653532c..25d243b 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -1,10 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifneq ($(BUILD_WITHOUT_PV),true) -include external/opencore/Config.mk -endif - LOCAL_SRC_FILES:= \ android_media_MediaPlayer.cpp \ android_media_MediaRecorder.cpp \ @@ -32,14 +28,6 @@ LOCAL_SHARED_LIBRARIES := \ libcamera_client \ libsqlite -ifneq ($(BUILD_WITHOUT_PV),true) - -LOCAL_SHARED_LIBRARIES += \ - libopencore_player -else - LOCAL_CFLAGS += -DNO_OPENCORE -endif - ifneq ($(TARGET_SIMULATOR),true) LOCAL_STATIC_LIBRARIES := libmtp libusbhost endif diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 6710db0..d4aacaf 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -792,10 +792,7 @@ extern int register_android_media_MtpClient(JNIEnv *env); extern int register_android_media_MtpCursor(JNIEnv *env); extern int register_android_media_MtpDatabase(JNIEnv *env); extern int register_android_media_MtpServer(JNIEnv *env); - -#ifndef NO_OPENCORE extern int register_android_media_AmrInputStream(JNIEnv *env); -#endif jint JNI_OnLoad(JavaVM* vm, void* reserved) { @@ -828,12 +825,10 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) goto bail; } -#ifndef NO_OPENCORE if (register_android_media_AmrInputStream(env) < 0) { LOGE("ERROR: AmrInputStream native registration failed\n"); goto bail; } -#endif if (register_android_media_ResampleInputStream(env) < 0) { LOGE("ERROR: ResampleInputStream native registration failed\n"); |