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

Commit 71c908c4 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make... 

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

Merge commit '6c33904a' into gingerbread-plus-aosp

* commit '6c33904a':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
parents 47f2cf62 6c33904a

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 \
@@ -27,14 +23,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    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 += \

media/jni/android_media_MediaPlayer.cpp

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