Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 6eec215a..70ed608 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 \
@@ -27,14 +23,6 @@
libstagefright \
libcamera_client
-ifneq ($(BUILD_WITHOUT_PV),true)
-
-LOCAL_SHARED_LIBRARIES += \
- libopencore_player
-else
- LOCAL_CFLAGS += -DNO_OPENCORE
-endif
-
LOCAL_STATIC_LIBRARIES :=
LOCAL_C_INCLUDES += \
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 474a174..6f94e8b 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -788,10 +788,7 @@
extern int register_android_media_MediaScanner(JNIEnv *env);
extern int register_android_media_ResampleInputStream(JNIEnv *env);
extern int register_android_media_MediaProfiles(JNIEnv *env);
-
-#ifndef NO_OPENCORE
extern int register_android_media_AmrInputStream(JNIEnv *env);
-#endif
jint JNI_OnLoad(JavaVM* vm, void* reserved)
{
@@ -824,12 +821,10 @@
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");