diff options
| author | Andrew Fernandes <andrew@fernandes.org> | 2013-08-20 12:19:26 -0400 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2013-12-28 22:58:06 +0000 |
| commit | 650e22508f6d595d73d565423cb06b14049bd3af (patch) | |
| tree | 5a706472608941535ffd7683ee266fe556e4fc22 | |
| parent | 805cc3ec40b5b6314e8cef8fb8cd9f8d4e95f293 (diff) | |
| download | libusb-650e22508f6d595d73d565423cb06b14049bd3af.tar.gz | |
Android: Build for all Android architectures
* Don't limit support to ARM only (adds MIPS support)
* Also add a workaround for a MIPS NDK linker bug
* Also add a gitignore entry required to run bootstrap.sh on OS X
* Closes #134
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | android/jni/Application.mk | 7 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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 |