Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee9c3dbd authored by Andreas Huber's avatar Andreas Huber
Browse files

resolved conflicts for merge of 71c908c4 to master 

Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
parents dc559c6f 71c908c4

media/jni/Android.mk

+0 −12
Original line number Diff line number Diff line 
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

media/jni/android_media_MediaPlayer.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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");