X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2FAndroid.mk;h=8d9ca0b223cbc26aea37efa8068f102991648278;hb=577426ccc66649228285c4a0b6ba8752836059c6;hp=dc194cac8efba24bf822929c5ecfed3f0e41de0b;hpb=b7202442677d0cf41e6e59870cd6c34e5619b8b9;p=rtmpclient.git

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index dc194ca..8d9ca0b 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,82 +1,8 @@
-LOCAL_PATH := $(call my-dir)
+MY_LOCAL_PATH := $(call my-dir)
+#LOCAL_PATH := $(MY_LOCAL_PATH)
+include $(MY_LOCAL_PATH)/libusb-1.0.22/android/jni/Android.mk
 
-# avdevice
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libavdevice
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libavdevice.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
+#LOCAL_PATH := $(MY_LOCAL_PATH)
+include $(MY_LOCAL_PATH)/UVCCamera/Android.mk
 
-# avcodec
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libavcodec
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libavcodec.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
 
-# avformat
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libavformat
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libavformat.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-# avfilter
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libavfilter
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libavfilter.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-# swresample
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libswresample
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libswresample.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-# swscale
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libswscale
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libswscale.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-# avutil
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libavutil
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libavutil.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-ifeq ($(TARGET_ARCH),x86)
-# x264
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libx264
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libx264.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-endif
-
-# postproc
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libpostproc
-LOCAL_SRC_FILES:= lib/$(TARGET_ARCH)/libpostproc.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-
-# ffmpegjni
-include $(CLEAR_VARS)
-LOCAL_MODULE := ffmpeg-jni
-LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp
-
-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_LDLIBS :=-llog -landroid
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file