From e67854cf32f49d8a72fbbdd303f035b49cf45b70 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Thu, 20 Jun 2013 18:49:18 +0800 Subject: [PATCH] jni: merge libs --- ijkmediaplayer/jni/Application.mk | 2 +- ijkmediaplayer/jni/ffplay/Android.mk | 2 +- .../Android.mk | 8 ++-- .../android}/ijkplayer_android.c | 0 .../android}/ijkplayer_android.h | 0 .../android}/ijkplayer_jni.c | 4 +- ijkmediaplayer/jni/ijksdl/Android.mk | 6 +++ .../android}/android_audiotrack.c | 4 +- .../android}/android_audiotrack.h | 4 +- .../android}/ijksdl_aout_android_audiotrack.c | 4 +- .../android}/ijksdl_aout_android_audiotrack.h | 2 +- .../ijksdl_vout_android_nativewindow.c | 6 +-- .../ijksdl_vout_android_nativewindow.h | 4 +- .../android}/ijksdl_vout_android_surface.c | 0 .../android}/ijksdl_vout_android_surface.h | 4 +- .../ijksdl_android.h | 12 +++--- ijkmediaplayer/jni/ijksdl_android/Android.mk | 39 ------------------- ijkmediaplayer/jni/ijkutil/Android.mk | 13 ++++++- .../android}/jnihelp.cpp | 2 +- .../android}/jnihelp.h | 0 .../ijkutil_android.h | 8 ++-- ijkmediaplayer/jni/ijkutil_android/Android.mk | 34 ---------------- 22 files changed, 51 insertions(+), 107 deletions(-) rename ijkmediaplayer/jni/{ijkplayer_android => ijkplayer}/Android.mk (86%) rename ijkmediaplayer/jni/{ijkplayer_android => ijkplayer/android}/ijkplayer_android.c (100%) rename ijkmediaplayer/jni/{ijkplayer_android => ijkplayer/android}/ijkplayer_android.h (100%) rename ijkmediaplayer/jni/{ijkplayer_android => ijkplayer/android}/ijkplayer_jni.c (99%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/android_audiotrack.c (99%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/android_audiotrack.h (98%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_aout_android_audiotrack.c (98%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_aout_android_audiotrack.h (97%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_vout_android_nativewindow.c (98%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_vout_android_nativewindow.h (95%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_vout_android_surface.c (100%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl/android}/ijksdl_vout_android_surface.h (95%) rename ijkmediaplayer/jni/{ijksdl_android => ijksdl}/ijksdl_android.h (80%) delete mode 100644 ijkmediaplayer/jni/ijksdl_android/Android.mk rename ijkmediaplayer/jni/{ijkutil_android => ijkutil/android}/jnihelp.cpp (99%) rename ijkmediaplayer/jni/{ijkutil_android => ijkutil/android}/jnihelp.h (100%) rename ijkmediaplayer/jni/{ijkutil_android => ijkutil}/ijkutil_android.h (93%) delete mode 100644 ijkmediaplayer/jni/ijkutil_android/Android.mk diff --git a/ijkmediaplayer/jni/Application.mk b/ijkmediaplayer/jni/Application.mk index 1cd5ea97..33481751 100644 --- a/ijkmediaplayer/jni/Application.mk +++ b/ijkmediaplayer/jni/Application.mk @@ -34,4 +34,4 @@ APP_CFLAGS := -O3 -Wall -pipe \ # armeabi-v7a APP_CFLAGS += -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -APP_LDFLAGS += -Wl,--fix-cortex-a8 \ No newline at end of file +APP_LDFLAGS += -Wl,--fix-cortex-a8 diff --git a/ijkmediaplayer/jni/ffplay/Android.mk b/ijkmediaplayer/jni/ffplay/Android.mk index 6e837fcd..c27bd26c 100644 --- a/ijkmediaplayer/jni/ffplay/Android.mk +++ b/ijkmediaplayer/jni/ffplay/Android.mk @@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) LOCAL_SRC_FILES += ff_cmdutils.c LOCAL_SRC_FILES += ff_ffplay.c -LOCAL_STATIC_LIBRARIES := ijksdl +LOCAL_SHARED_LIBRARIES := ijksdl LOCAL_MODULE := ffplay include $(BUILD_STATIC_LIBRARY) diff --git a/ijkmediaplayer/jni/ijkplayer_android/Android.mk b/ijkmediaplayer/jni/ijkplayer/Android.mk similarity index 86% rename from ijkmediaplayer/jni/ijkplayer_android/Android.mk rename to ijkmediaplayer/jni/ijkplayer/Android.mk index 4c0b030f..89067b4f 100644 --- a/ijkmediaplayer/jni/ijkplayer_android/Android.mk +++ b/ijkmediaplayer/jni/ijkplayer/Android.mk @@ -27,11 +27,11 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH) LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) -LOCAL_SRC_FILES += ijkplayer_jni.c -LOCAL_SRC_FILES += ijkplayer_android.c +LOCAL_SRC_FILES += android/ijkplayer_jni.c +LOCAL_SRC_FILES += android/ijkplayer_android.c LOCAL_STATIC_LIBRARIES := ffplay -LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil_android ijksdl_android +LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil ijksdl -LOCAL_MODULE := ijkplayer_android +LOCAL_MODULE := ijkplayer include $(BUILD_SHARED_LIBRARY) diff --git a/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c b/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c similarity index 100% rename from ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.c rename to ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c diff --git a/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.h b/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h similarity index 100% rename from ijkmediaplayer/jni/ijkplayer_android/ijkplayer_android.h rename to ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.h diff --git a/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c b/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c similarity index 99% rename from ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c rename to ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c index 323e3e2a..784ece64 100644 --- a/ijkmediaplayer/jni/ijkplayer_android/ijkplayer_jni.c +++ b/ijkmediaplayer/jni/ijkplayer/android/ijkplayer_jni.c @@ -24,8 +24,8 @@ #include #include #include -#include "ijksdl_android/ijksdl_android.h" -#include "ijkutil_android/ijkutil_android.h" +#include "ijksdl/ijksdl_android.h" +#include "ijkutil/ijkutil_android.h" #include "ffplay/ff_ffplay.h" #include "ijkplayer_android.h" diff --git a/ijkmediaplayer/jni/ijksdl/Android.mk b/ijkmediaplayer/jni/ijksdl/Android.mk index 74de5899..5b08649f 100644 --- a/ijkmediaplayer/jni/ijksdl/Android.mk +++ b/ijkmediaplayer/jni/ijksdl/Android.mk @@ -35,5 +35,11 @@ LOCAL_SRC_FILES += ijksdl_timer.c LOCAL_SRC_FILES += ijksdl_vout.c LOCAL_SRC_FILES += ijksdl_vout_overlay_ffmpeg.c +LOCAL_SRC_FILES += android/ijksdl_aout_android_audiotrack.c +LOCAL_SRC_FILES += android/android_audiotrack.c + +LOCAL_SRC_FILES += android/ijksdl_vout_android_nativewindow.c +LOCAL_SRC_FILES += android/ijksdl_vout_android_surface.c + LOCAL_MODULE := ijksdl include $(BUILD_STATIC_LIBRARY) diff --git a/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.c b/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c similarity index 99% rename from ijkmediaplayer/jni/ijksdl_android/android_audiotrack.c rename to ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c index 8688009a..68e8fb47 100644 --- a/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.c +++ b/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c @@ -24,8 +24,8 @@ #include "android_audiotrack.h" #include -#include "ijkutil_android/ijkutil_android.h" -#include "ijksdl/ijksdl_audio.h" +#include "ijkutil/ijkutil_android.h" +#include "../ijksdl_audio.h" typedef struct AudioChannelMapEntry { Uint8 sdl_channel; diff --git a/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h b/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h similarity index 98% rename from ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h rename to ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h index e9406dd8..ea19b978 100644 --- a/ijkmediaplayer/jni/ijksdl_android/android_audiotrack.h +++ b/ijkmediaplayer/jni/ijksdl/android/android_audiotrack.h @@ -26,8 +26,8 @@ #include #include -#include "ijksdl/ijksdl_audio.h" -#include "ijksdl/ijksdl_aout.h" +#include "../ijksdl_audio.h" +#include "../ijksdl_aout.h" typedef struct SDL_AndroidAudioTrack_Spec { enum StreamType { diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c b/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c similarity index 98% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c index b0a2481b..98f01d2a 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.c +++ b/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c @@ -26,8 +26,8 @@ #include #include #include "ijkutil/ijkutil.h" -#include "ijksdl/ijksdl_thread.h" -#include "ijksdl/ijksdl_aout_internal.h" +#include "../ijksdl_thread.h" +#include "../ijksdl_aout_internal.h" #include "android_audiotrack.h" typedef struct SDL_Aout_Opaque { diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h b/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h similarity index 97% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h index 2024aa86..87c6637f 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_aout_android_audiotrack.h +++ b/ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.h @@ -25,7 +25,7 @@ #define IJKSDL_ANDROID__IJKSDL_AOUT_ANDROID_AUDIOTRACK_H #include -#include "ijksdl/ijksdl_aout.h" +#include "../ijksdl_aout.h" void SDL_Init_AoutAndroid(JNIEnv *env); SDL_Aout *SDL_AoutAndroid_CreateForAudioTrack(JavaVM* jvm); diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.c b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c similarity index 98% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.c rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c index 6adb7553..5a1d7fc0 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.c +++ b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c @@ -26,9 +26,9 @@ #include #include #include "ijkutil/ijkutil.h" -#include "ijksdl/ijksdl_ffinc.h" -#include "ijksdl/ijksdl_vout.h" -#include "ijksdl/ijksdl_vout_internal.h" +#include "../ijksdl_ffinc.h" +#include "../ijksdl_vout.h" +#include "../ijksdl_vout_internal.h" typedef struct SDL_VoutSurface_Opaque { SDL_Vout *vout; diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h similarity index 95% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h index aa9599af..b851cfad 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_nativewindow.h +++ b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.h @@ -24,8 +24,8 @@ #ifndef IJKSDL_ANDROID__IJKSDL_VOUT_ANDROID_NATIVEWINDOW_H #define IJKSDL_ANDROID__IJKSDL_VOUT_ANDROID_NATIVEWINDOW_H -#include "ijksdl/ijksdl_stdinc.h" -#include "ijksdl/ijksdl_vout.h" +#include "../ijksdl_stdinc.h" +#include "../ijksdl_vout.h" typedef struct ANativeWindow ANativeWindow; diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.c b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c similarity index 100% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.c rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h similarity index 95% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h rename to ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h index e5d69a7a..fb1aebb9 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_vout_android_surface.h +++ b/ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h @@ -25,8 +25,8 @@ #define IJKSDL_ANDROID__IJKSDL_VOUT_ANDROID_SURFACE_H #include -#include "ijksdl/ijksdl_stdinc.h" -#include "ijksdl/ijksdl_vout.h" +#include "../ijksdl_stdinc.h" +#include "../ijksdl_vout.h" SDL_Vout *SDL_VoutAndroid_CreateForAndroidSurface(); void SDL_VoutAndroid_SetAndroidSurface(SDL_Vout *vout, JNIEnv *env, jobject android_surface); diff --git a/ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h b/ijkmediaplayer/jni/ijksdl/ijksdl_android.h similarity index 80% rename from ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h rename to ijkmediaplayer/jni/ijksdl/ijksdl_android.h index 1aaa5953..d13e956b 100644 --- a/ijkmediaplayer/jni/ijksdl_android/ijksdl_android.h +++ b/ijkmediaplayer/jni/ijksdl/ijksdl_android.h @@ -21,14 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IJKSDL_ANDROID__IJKSDL_ANDROID_H -#define IJKSDL_ANDROID__IJKSDL_ANDROID_H +#ifndef IJKSDL__IJKSDL_ANDROID_H +#define IJKSDL__IJKSDL_ANDROID_H -#include "ijksdl/ijksdl.h" +#include "ijksdl.h" -#include "ijksdl_aout_android_audiotrack.h" +#include "android/ijksdl_aout_android_audiotrack.h" -#include "ijksdl_vout_android_nativewindow.h" -#include "ijksdl_vout_android_surface.h" +#include "android/ijksdl_vout_android_nativewindow.h" +#include "android/ijksdl_vout_android_surface.h" #endif diff --git a/ijkmediaplayer/jni/ijksdl_android/Android.mk b/ijkmediaplayer/jni/ijksdl_android/Android.mk deleted file mode 100644 index 350130c7..00000000 --- a/ijkmediaplayer/jni/ijksdl_android/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# copyright (c) 2013 Zhang Rui -# -# This file is part of ijkPlayer. -# -# ijkPlayer is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# ijkPlayer is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with ijkPlayer; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_CFLAGS += -std=c99 -LOCAL_LDLIBS += -llog -landroid - -LOCAL_C_INCLUDES += $(LOCAL_PATH) -LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH) -LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) - -LOCAL_SRC_FILES += ijksdl_aout_android_audiotrack.c -LOCAL_SRC_FILES += android_audiotrack.c - -LOCAL_SRC_FILES += ijksdl_vout_android_nativewindow.c -LOCAL_SRC_FILES += ijksdl_vout_android_surface.c - -LOCAL_STATIC_LIBRARIES := ijksdl -LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil_android - -LOCAL_MODULE := ijksdl_android -include $(BUILD_SHARED_LIBRARY) diff --git a/ijkmediaplayer/jni/ijkutil/Android.mk b/ijkmediaplayer/jni/ijkutil/Android.mk index eb41a5a0..27ceccb5 100644 --- a/ijkmediaplayer/jni/ijkutil/Android.mk +++ b/ijkmediaplayer/jni/ijkutil/Android.mk @@ -31,6 +31,16 @@ LOCAL_MODULE := ijkutil_c include $(BUILD_STATIC_LIBRARY) +#-------------------- +# CPP files: android +#-------------------- +include $(CLEAR_VARS) +LOCAL_SRC_FILES += android/jnihelp.cpp + +LOCAL_MODULE := ijkutil_android_cpp +include $(BUILD_STATIC_LIBRARY) + + #-------------------- # so #-------------------- @@ -38,6 +48,7 @@ include $(CLEAR_VARS) LOCAL_LDLIBS += -llog LOCAL_STATIC_LIBRARIES := ijkutil_c +LOCAL_WHOLE_STATIC_LIBRARIES := ijkutil_android_cpp LOCAL_MODULE := ijkutil -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) diff --git a/ijkmediaplayer/jni/ijkutil_android/jnihelp.cpp b/ijkmediaplayer/jni/ijkutil/android/jnihelp.cpp similarity index 99% rename from ijkmediaplayer/jni/ijkutil_android/jnihelp.cpp rename to ijkmediaplayer/jni/ijkutil/android/jnihelp.cpp index 7be43659..df317f2f 100644 --- a/ijkmediaplayer/jni/ijkutil_android/jnihelp.cpp +++ b/ijkmediaplayer/jni/ijkutil/android/jnihelp.cpp @@ -22,7 +22,7 @@ #include #define LOG_TAG "JNIHelp" -#include "ijkutil/ijkutil.h" +#include "../loghelp.h" /** * Equivalent to ScopedLocalRef, but for C_JNIEnv instead. (And slightly more powerful.) diff --git a/ijkmediaplayer/jni/ijkutil_android/jnihelp.h b/ijkmediaplayer/jni/ijkutil/android/jnihelp.h similarity index 100% rename from ijkmediaplayer/jni/ijkutil_android/jnihelp.h rename to ijkmediaplayer/jni/ijkutil/android/jnihelp.h diff --git a/ijkmediaplayer/jni/ijkutil_android/ijkutil_android.h b/ijkmediaplayer/jni/ijkutil/ijkutil_android.h similarity index 93% rename from ijkmediaplayer/jni/ijkutil_android/ijkutil_android.h rename to ijkmediaplayer/jni/ijkutil/ijkutil_android.h index ab3c535c..663e40d0 100644 --- a/ijkmediaplayer/jni/ijkutil_android/ijkutil_android.h +++ b/ijkmediaplayer/jni/ijkutil/ijkutil_android.h @@ -21,11 +21,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IJKUTIL_ANDROID__IJKUTIL_ANDROID_H -#define IJKUTIL_ANDROID__IJKUTIL_ANDROID_H +#ifndef IJKUTIL__IJKUTIL_ANDROID_H +#define IJKUTIL__IJKUTIL_ANDROID_H -#include "ijkutil/ijkutil.h" -#include "jnihelp.h" +#include "ijkutil.h" +#include "android/jnihelp.h" #define JNI_CHECK_GOTO(condition__, env__, exception__, msg__, label__) \ do { \ diff --git a/ijkmediaplayer/jni/ijkutil_android/Android.mk b/ijkmediaplayer/jni/ijkutil_android/Android.mk deleted file mode 100644 index 8548bfbb..00000000 --- a/ijkmediaplayer/jni/ijkutil_android/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# copyright (c) 2013 Zhang Rui -# -# This file is part of ijkPlayer. -# -# ijkPlayer is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# ijkPlayer is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with ijkPlayer; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -LOCAL_PATH := $(call my-dir) - - -#-------------------- -# so -#-------------------- -include $(CLEAR_VARS) -LOCAL_C_INCLUDES += $(LOCAL_PATH) -LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) -LOCAL_LDLIBS += -llog - -LOCAL_SRC_FILES += jnihelp.cpp -LOCAL_STATIC_LIBRARIES := ijkutil - -LOCAL_MODULE := ijkutil_android -include $(BUILD_SHARED_LIBRARY) -- GitLab