X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2Flibuvc%2Fandroid%2Fjni%2FAndroid.mk;fp=app%2Fsrc%2Fmain%2Fjni%2Flibuvc%2Fandroid%2Fjni%2FAndroid.mk;h=0000000000000000000000000000000000000000;hb=4d7fc85844bbd24cc1b15f60fed3b8aaa507962f;hp=17d6d572e9c9b352c386d0bc254abcfe4736249b;hpb=d0d496554f96cebf84db3e9b3cf507577272ef8c;p=rtmpclient.git

diff --git a/app/src/main/jni/libuvc/android/jni/Android.mk b/app/src/main/jni/libuvc/android/jni/Android.mk
deleted file mode 100644
index 17d6d57..0000000
--- a/app/src/main/jni/libuvc/android/jni/Android.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#/*********************************************************************
-#* Software License Agreement (BSD License)
-#*
-#* Copyright (C)2014-2017 saki@serenegiant <t_saki@serenegiant.com>
-#*  All rights reserved.
-#*
-#*  Redistribution and use in source and binary forms, with or without
-#*  modification, are permitted provided that the following conditions
-#*  are met:
-#*
-#*   * Redistributions of source code must retain the above copyright
-#*     notice, this list of conditions and the following disclaimer.
-#*   * Redistributions in binary form must reproduce the above
-#*     copyright notice, this list of conditions and the following
-#*     disclaimer in the documentation and/or other materials provided
-#*     with the distribution.
-#*   * Neither the name of the author nor other contributors may be
-#*     used to endorse or promote products derived from this software
-#*     without specific prior written permission.
-#*
-#*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-#*  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-#*  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#*  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-#*  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-#*  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-#*  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-#*  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-#*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#*  POSSIBILITY OF SUCH DAMAGE.
-#*********************************************************************/
-
-######################################################################
-# libuvc_static.a (static library with static link to libjpeg, libusb1.0)
-######################################################################
-LOCAL_PATH	:= $(call my-dir)/../..
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/.. \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/include/libuvc
-
-LOCAL_EXPORT_C_INCLUDES := \
-	$(LOCAL_PATH)/ \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/include/libuvc
-
-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 += usb100
-
-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)