diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 15:53:26 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-09-01 15:53:26 -0700 |
| commit | ee9c3dbdd04a73d867a1358a8e50848c40d0153f (patch) | |
| tree | b52b647860643ef5f7474dcbf43494d1c3ed20e0 /media/jni | |
| parent | dc559c6fefadc1cd3e62d232a332c7071fc9b082 (diff) | |
| parent | 71c908c475aac03122bee0b764816f09a18ce8aa (diff) | |
| download | frameworks_base-ee9c3dbdd04a73d867a1358a8e50848c40d0153f.zip frameworks_base-ee9c3dbdd04a73d867a1358a8e50848c40d0153f.tar.gz frameworks_base-ee9c3dbdd04a73d867a1358a8e50848c40d0153f.tar.bz2 | |
resolved conflicts for merge of 71c908c4 to master
Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
Diffstat (limited to 'media/jni')
| -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"); |