diff --git a/build.xml b/build.xml index e834ffd796..baed194f8c 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ Cross-compile by specifying -Dos.prefix={name-arch} to ant (cross-compile currently only configured/tested on w32ce-arm and - android-{arm|aarch64|x86|x86-64|mips|mips64}) + android-{arm|armv7|aarch64|x86|x86-64|mips|mips64}) Use ANT_OPTS=-Dskip-native=false to build native parts, or directly invoke the native or test targets @@ -177,7 +177,7 @@ - + @@ -615,6 +615,7 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc + @@ -688,6 +689,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc + + + diff --git a/lib/native/android-armv7.jar b/lib/native/android-armv7.jar new file mode 100644 index 0000000000..4a0b34b6c7 Binary files /dev/null and b/lib/native/android-armv7.jar differ diff --git a/native/Makefile b/native/Makefile index 5acfa254d2..5da5b605e1 100644 --- a/native/Makefile +++ b/native/Makefile @@ -16,7 +16,7 @@ # Solaris (i386/amd64/sparc/sparcv9) # AIX (ppc/ppc64) # FreeBSD/OpenBSD/NetBSD (i386/amd64) -# Android (arm/aarch64/x86/x86-64/mipsel/mips64el) +# Android (arm/armv7/aarch64/x86/x86-64/mipsel/mips64el) # # Built, but with outstanding bugs (not necessarily within JNA): # @@ -111,7 +111,7 @@ endif STRIP=strip -x # end defaults -# Android build (cross-compile) requires the android SDK+NDK. +# Android build (cross-compile) requires the android NDK. # Ensure the following tools are in your path and adjust NDK_PLATFORM as needed ifeq ($(OS),android) AARCH=$(ARCH) @@ -120,6 +120,11 @@ ifeq ($(ARCH),arm) PREFIX=arm-linux-androideabi- COPT+= -mthumb-interwork -march=armv5te -mtune=xscale -msoft-float -fstack-protector HOST=arm-linux-eabi +else ifeq ($(ARCH),armv7) +PREFIX=arm-linux-androideabi- +COPT+= -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -Wl,--fix-cortex-a8 +HOST=arm-linux-eabi +AARCH=arm else ifeq ($(ARCH),aarch64) PREFIX=aarch64-linux-android- HOST=aarch64-linux-android