build ok for libusb libuvc

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 8d9ca0b..9837ea0 100644 (file)
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,8 +1,6 @@
 MY_LOCAL_PATH := $(call my-dir)
-#LOCAL_PATH := $(MY_LOCAL_PATH)
 include $(MY_LOCAL_PATH)/libusb-1.0.22/android/jni/Android.mk
-
-#LOCAL_PATH := $(MY_LOCAL_PATH)
+include $(MY_LOCAL_PATH)/libuvc-0.0.6/android/jni/Android.mk
 include $(MY_LOCAL_PATH)/UVCCamera/Android.mk
 
 

diff --git a/app/src/main/jni/UVCCamera/Android.mk b/app/src/main/jni/UVCCamera/Android.mk
index 6a1002e..0115ce5 100644 (file)
--- a/app/src/main/jni/UVCCamera/Android.mk
+++ b/app/src/main/jni/UVCCamera/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
-$(warning $(LOCAL_PATH))
+#$(warning $(LOCAL_PATH))
 FFMPEG_DIR := $(abspath $(LOCAL_PATH)/../ffmpeg-3.0.11)
-$(warning $(FFMPEG_DIR))
+#$(warning $(FFMPEG_DIR))
 
 
 # avdevice

diff --git a/app/src/main/jni/libuvc-0.0.6/android/jni/Android.mk b/app/src/main/jni/libuvc-0.0.6/android/jni/Android.mk
new file mode 100644 (file)
index 0000000..aa36a82
--- /dev/null
+++ b/app/src/main/jni/libuvc-0.0.6/android/jni/Android.mk
@@ -0,0 +1,54 @@
+######################################################################
+# libuvc_static.a (static library with static link to libjpeg, libusb1.0)
+######################################################################
+LOCAL_PATH     := $(call my-dir)/../..
+$(warning $(LOCAL_PATH))
+include $(CLEAR_VARS)
+UVC_ROOT := $(abspath $(LOCAL_PATH))
+$(warning $(UVC_ROOT))
+
+
+
+LOCAL_C_INCLUDES += $(UVC_ROOT)/include $(UVC_ROOT)/
+
+
+LOCAL_EXPORT_C_INCLUDES := $(UVC_ROOT)/include
+
+$(warning $(LOCAL_EXPORT_C_INCLUDES))
+
+LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+LOCAL_CFLAGS += -DANDROID_NDK
+LOCAL_CFLAGS += -DLOG_NDEBUG
+LOCAL_CFLAGS += -DUVC_DEBUGGING
+
+LOCAL_EXPORT_LDLIBS := -llog
+
+LOCAL_ARM_MODE := arm
+
+#LOCAL_STATIC_LIBRARIES += jpeg-turbo1500_static
+#LOCAL_SHARED_LIBRARIES += jpeg-turbo1500
+LOCAL_SHARED_LIBRARIES += usb1.0
+
+LOCAL_SRC_FILES := \
+       src/ctrl.c \
+       src/device.c \
+       src/diag.c \
+       src/frame.c \
+       src/init.c \
+       src/stream.c
+
+LOCAL_MODULE := libuvc_static
+include $(BUILD_STATIC_LIBRARY)
+
+######################################################################
+# libuvc.so
+######################################################################
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_EXPORT_LDLIBS += -llog
+
+LOCAL_WHOLE_STATIC_LIBRARIES = libuvc_static
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
+LOCAL_MODULE := uvc
+include $(BUILD_SHARED_LIBRARY)

diff --git a/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_config.h b/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_config.h
new file mode 100644 (file)
index 0000000..66eb2d0
--- /dev/null
+++ b/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_config.h
@@ -0,0 +1,22 @@
+#ifndef LIBUVC_CONFIG_H
+#define LIBUVC_CONFIG_H
+
+#define LIBUVC_VERSION_MAJOR 0
+#define LIBUVC_VERSION_MINOR 0
+#define LIBUVC_VERSION_PATCH 6
+#define LIBUVC_VERSION_STR "0.0.6"
+#define LIBUVC_VERSION_INT                      \
+  ((0 << 16) |             \
+   (0 << 8) |              \
+   (6))
+
+/** @brief Test whether libuvc is new enough
+ * This macro evaluates true iff the current version is
+ * at least as new as the version specified.
+ */
+#define LIBUVC_VERSION_GTE(major, minor, patch)                         \
+  (LIBUVC_VERSION_INT >= (((major) << 16) | ((minor) << 8) | (patch)))
+
+#define LIBUVC_HAS_JPEG 1
+
+#endif // !def(LIBUVC_CONFIG_H)