X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2FAndroid.mk;h=5a8b542f4468caf517176631abcc53b155724ac8;hb=4d7fc85844bbd24cc1b15f60fed3b8aaa507962f;hp=0e63b81f0c19c00120035c168f1c7c7bce5582b5;hpb=061580c83656bf358b01a6b78fd22ae9bd497728;p=rtmpclient.git

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 0e63b81..5a8b542 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,6 +1,10 @@
 JNI_PATH := $(call my-dir)
-include $(JNI_PATH)/libusb-1.0.22/android/jni/Android.mk
-include $(JNI_PATH)/libuvc-0.0.6/android/jni/Android.mk
+#include $(JNI_PATH)/libusb-1.0.22/android/jni/Android.mk
+#include $(JNI_PATH)/libuvc-0.0.6/android/jni/Android.mk
+
+#include $(JNI_PATH)/libusb/android/jni/Android.mk
+#include $(JNI_PATH)/libuvc/android/jni/Android.mk
+
 
 
 #include $(JNI_PATH)/UVCCamera/Android.mk
@@ -14,7 +18,8 @@ LOCAL_PATH := $(JNI_PATH)
 
 #$(warning $(LOCAL_PATH))
 FFMPEG_DIR := $(abspath $(LOCAL_PATH)/ffmpeg-3.0.11)
-UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc-0.0.6)
+#UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc-0.0.6)
+UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc)
 
 
 
@@ -86,25 +91,36 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 
 # ffmpegjni
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := ffmpeg-jni
+#LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp
+#LOCAL_C_INCLUDES := $(UVC_ROOT)/include
+#ifeq ($(TARGET_ARCH),x86)
+#LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264
+#else
+#LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc
+#endif
+#LOCAL_CFLAGS := -D__ANDROID_API__=21
+#LOCAL_CFLAGS += -I$(LOCAL_PATH)/../ffmpeg-3.0.11/include
+#LOCAL_CFLAGS += -I$(FFMPEG_DIR)/include
+#LOCAL_CFLAGS += -Ijni/ffmpeg-3.0.11/include
+#LOCAL_LDLIBS :=-llog -landroid
+#include $(BUILD_SHARED_LIBRARY)
+
 
+# FfmpegHelperJNI
 include $(CLEAR_VARS)
-LOCAL_MODULE := ffmpeg-jni
-LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp \
-                   ai_suanzi_rtmpclient_UVCCamera.cpp \
-                   UVCCamera.cpp
+LOCAL_MODULE := FfmpegHelperJNI
+LOCAL_SRC_FILES :=  ai_suanzi_rtmpclient_FfmpegHelper.cpp \
+                    FfmpegHelper.cpp
 
 LOCAL_C_INCLUDES := $(UVC_ROOT)/include
 ifeq ($(TARGET_ARCH),x86)
-LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264 uvc
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264
 else
-LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc uvc
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc
 endif
-LOCAL_CFLAGS := -D__ANDROID_API__=21
-#LOCAL_CFLAGS += -I$(LOCAL_PATH)/../ffmpeg-3.0.11/include
-#LOCAL_CFLAGS += -I$(FFMPEG_DIR)/include
-#LOCAL_CFLAGS += -Ijni/ffmpeg-3.0.11/include
-
-
+#LOCAL_CFLAGS := -D__ANDROID_API__=21
 LOCAL_LDLIBS :=-llog -landroid
 include $(BUILD_SHARED_LIBRARY)