[tor-commits] [orbot/master] enable compiliation for all android not just armv7

[n8fr8@xxxxxxxxxxxxxx]

commit 649ca401e714169784a30c95e3f7589ba25cf409
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Sun Jan 12 22:15:50 2014 -0500

    enable compiliation for all android not just armv7
---
 external/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index cef047c..252d6aa 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -29,7 +29,7 @@ APP_ABI=armeabi
 APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="\([0-9][0-9]*\)".*,\1,p' \
 	$(EXTERNAL_ROOT)/../AndroidManifest.xml)
 NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI)
-NDK_TOOLCHAIN_VERSION=4.6
+NDK_TOOLCHAIN_VERSION=4.7
 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
 ifeq ($(NDK_ABI),x86)
  HOST = i686-linux-android
@@ -81,7 +81,7 @@ all: assets
 lib/libcrypto.a:
 	cd openssl && \
 		CC="$(CC)" \
-		./Configure android-armv7 && \
+		./Configure android -DL_ENDIAN && \
 		ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
 
 lib/libssl.a:
@@ -89,7 +89,7 @@ lib/libssl.a:
 	cp config.guess openssl
 	cd openssl && \
 		CC="$(CC)"\
-		./Configure android-armv7 && \
+		./Configure android -DL_ENDIAN && \
 		ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
 
 openssl-build-stamp: lib/libcrypto.a lib/libssl.a



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits