summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--android/jni/Application.mk7
-rw-r--r--libusb/version_nano.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 67151c7..b04936f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ Release
*.patch
*~
*.orig
+.dirstamp
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 4ab1012..f972a9e 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -16,4 +16,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
-APP_ABI := armeabi armeabi-v7a x86
+APP_ABI := all
+
+# Workaround for MIPS toolchain linker being unable to find liblog dependency
+# of shared object in NDK versions at least up to r9.
+#
+APP_LDFLAGS := -llog
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index e55102e..92a8c18 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10853
+#define LIBUSB_NANO 10854