dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable compiliation for all android not just armv7

This commit is contained in:
Nathan Freitas 2014-01-12 22:15:50 -05:00
parent 591161f1b8
commit 649ca401e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/Makefile vendored
View File

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