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

Commit 81ea83d1 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Move MTP JNI code from libandroid_runtime to libmedia_jni 



Signed-off-by: default avatarMike Lockwood <lockwood@android.com>

Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
parent 767c5e4b

core/jni/Android.mk

+1 −8
Original line number Diff line number Diff line
@@ -112,9 +112,6 @@ LOCAL_SRC_FILES:= \ 
	android_media_AudioSystem.cpp \

	android_media_AudioTrack.cpp \

	android_media_JetPlayer.cpp \

	android_media_MtpClient.cpp \

	android_media_MtpCursor.cpp \

	android_media_MtpServer.cpp \

	android_media_ToneGenerator.cpp \

	android_hardware_Camera.cpp \

	android_hardware_SensorManager.cpp \
@@ -149,7 +146,6 @@ LOCAL_C_INCLUDES += \ 
	$(call include-path-for, libhardware_legacy)/hardware_legacy \

	$(LOCAL_PATH)/../../include/ui \

	$(LOCAL_PATH)/../../include/utils \

	$(LOCAL_PATH)/../../media/mtp \

	external/skia/include/core \

	external/skia/include/effects \

	external/skia/include/images \
@@ -194,10 +190,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libicudata \

	libmedia \

	libwpa_client \

	libjpeg \

	libstagefright



LOCAL_STATIC_LIBRARIES := libmtp libusbhost

	libjpeg



ifeq ($(BOARD_HAVE_BLUETOOTH),true)

LOCAL_C_INCLUDES += \

core/jni/AndroidRuntime.cpp

+0 −6
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ extern int register_android_database_SQLiteProgram(JNIEnv* env); 
extern int register_android_database_SQLiteQuery(JNIEnv* env);

extern int register_android_database_SQLiteStatement(JNIEnv* env);

extern int register_android_debug_JNITest(JNIEnv* env);

extern int register_android_media_MtpClient(JNIEnv *env);

extern int register_android_media_MtpCursor(JNIEnv *env);

extern int register_android_media_MtpServer(JNIEnv *env);

extern int register_android_nio_utils(JNIEnv* env);

extern int register_android_pim_EventRecurrence(JNIEnv* env);

extern int register_android_text_format_Time(JNIEnv* env);
@@ -1282,9 +1279,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_media_AudioSystem),

    REG_JNI(register_android_media_AudioTrack),

    REG_JNI(register_android_media_JetPlayer),

    REG_JNI(register_android_media_MtpClient),

    REG_JNI(register_android_media_MtpCursor),

    REG_JNI(register_android_media_MtpServer),

    REG_JNI(register_android_media_ToneGenerator),



    REG_JNI(register_android_opengl_classes),

include/android_runtime/AndroidRuntime.h

+5 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


namespace android {



class CursorWindow;



class AndroidRuntime

{

public:
@@ -121,6 +123,8 @@ private: 
// Returns the Unix file descriptor for a ParcelFileDescriptor object

extern int getParcelFileDescriptorFD(JNIEnv* env, jobject object);



extern CursorWindow * get_window_from_object(JNIEnv * env, jobject javaWindow);



}



#endif

media/jni/Android.mk

+8 −3
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ LOCAL_SRC_FILES:= \ 
    android_media_MediaMetadataRetriever.cpp \

    android_media_ResampleInputStream.cpp \

    android_media_MediaProfiles.cpp \

    android_media_AmrInputStream.cpp

    android_media_AmrInputStream.cpp \

	android_media_MtpClient.cpp \

	android_media_MtpCursor.cpp \

	android_media_MtpServer.cpp \



LOCAL_SHARED_LIBRARIES := \

    libandroid_runtime \
@@ -25,7 +28,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libsurfaceflinger_client \

    libstagefright \

    libcamera_client

    libcamera_client \

	libsqlite



ifneq ($(BUILD_WITHOUT_PV),true)
@@ -35,7 +39,7 @@ else 
    LOCAL_CFLAGS += -DNO_OPENCORE

endif



LOCAL_STATIC_LIBRARIES :=

LOCAL_STATIC_LIBRARIES := libmtp libusbhost



LOCAL_C_INCLUDES += \

    external/tremor/Tremor \
@@ -44,6 +48,7 @@ LOCAL_C_INCLUDES += \ 
    frameworks/base/media/libstagefright/codecs/amrnb/enc/src \

    frameworks/base/media/libstagefright/codecs/amrnb/common \

    frameworks/base/media/libstagefright/codecs/amrnb/common/include \

    frameworks/base/media/mtp \

    $(PV_INCLUDES) \

    $(JNI_H_INCLUDE) \

    $(call include-path-for, corecg graphics)

media/jni/android_media_MediaPlayer.cpp

+18 −0
Original line number Diff line number Diff line
@@ -777,6 +777,9 @@ 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);

extern int register_android_media_MtpClient(JNIEnv *env);

extern int register_android_media_MtpCursor(JNIEnv *env);

extern int register_android_media_MtpServer(JNIEnv *env);



#ifndef NO_OPENCORE

extern int register_android_media_AmrInputStream(JNIEnv *env);
@@ -830,6 +833,21 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) 
        goto bail;

    }



    if (register_android_media_MtpClient(env) < 0) {

        LOGE("ERROR: MtpClient native registration failed");

        goto bail;

    }



    if (register_android_media_MtpCursor(env) < 0) {

        LOGE("ERROR: MtpCursor native registration failed");

        goto bail;

    }



    if (register_android_media_MtpServer(env) < 0) {

        LOGE("ERROR: MtpServer native registration failed");

        goto bail;

    }



    /* success -- return valid version number */

    result = JNI_VERSION_1_4;