drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread

Browse Source 
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
This commit is contained in:
Andreas Huber
2010-09-01 13:57:44 -07:00
committed by Android Git Automerger
parent 47f2cf6207 6c33904ad9
commit 71c908c475
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/jni/Android.mk
View File

@ -1,10 +1,6 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
ifneq ($(BUILD_WITHOUT_PV),true)
include external/opencore/Config.mk
endif
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
android_media_MediaPlayer.cpp \ android_media_MediaPlayer.cpp \
android_media_MediaRecorder.cpp \ android_media_MediaRecorder.cpp \
@ -27,14 +23,6 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright \ libstagefright \
libcamera_client libcamera_client
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_SHARED_LIBRARIES += \
libopencore_player
else
LOCAL_CFLAGS += -DNO_OPENCORE
endif
LOCAL_STATIC_LIBRARIES := LOCAL_STATIC_LIBRARIES :=
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \

5
media/jni/android_media_MediaPlayer.cpp
View File

@ -788,10 +788,7 @@ extern int register_android_media_MediaRecorder(JNIEnv *env);
extern int register_android_media_MediaScanner(JNIEnv *env); extern int register_android_media_MediaScanner(JNIEnv *env);
extern int register_android_media_ResampleInputStream(JNIEnv *env); extern int register_android_media_ResampleInputStream(JNIEnv *env);
extern int register_android_media_MediaProfiles(JNIEnv *env); extern int register_android_media_MediaProfiles(JNIEnv *env);
#ifndef NO_OPENCORE
extern int register_android_media_AmrInputStream(JNIEnv *env); extern int register_android_media_AmrInputStream(JNIEnv *env);
#endif
jint JNI_OnLoad(JavaVM* vm, void* reserved) jint JNI_OnLoad(JavaVM* vm, void* reserved)
{ {
@ -824,12 +821,10 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
goto bail; goto bail;
} }
#ifndef NO_OPENCORE
if (register_android_media_AmrInputStream(env) < 0) { if (register_android_media_AmrInputStream(env) < 0) {
LOGE("ERROR: AmrInputStream native registration failed\n"); LOGE("ERROR: AmrInputStream native registration failed\n");
goto bail; goto bail;
} }
#endif
if (register_android_media_ResampleInputStream(env) < 0) { if (register_android_media_ResampleInputStream(env) < 0) {
LOGE("ERROR: ResampleInputStream native registration failed\n"); LOGE("ERROR: ResampleInputStream native registration failed\n");