commit ca8197fa5b2dc22f538943482849b9ee90a1b808 Author: Hans-Christoph Steiner hans@eds.org Date: Thu Dec 5 19:28:54 2013 -0500

update native build to include Android NDK build flags

This updates external/Makefile to be more integrated into the Android NDK, by using the same variable names and including build flags from the NDK. --- external/Makefile | 122 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 45 deletions(-)

diff --git a/external/Makefile b/external/Makefile index 6ecc3f6..b6771a4 100644 --- a/external/Makefile +++ b/external/Makefile @@ -5,55 +5,73 @@ # on Debian or Ubuntu

### these modify the calling shell -# point pkg-config to the .pc files generated from these builds -export PKG_CONFIG_PATH=$(LOCAL)/lib/pkgconfig # workaround for cross-compiling bug in autoconf export ac_cv_func_malloc_0_nonnull=yes export ac_cv_func_setpgrp_void=yes

-CWD = $(shell pwd) -PROJECT_ROOT = $(CWD)/.. -EXTERNAL_ROOT = $(CWD) - -# Android NDK setup: -NDK_BASE ?= /usr/local/android-ndk -NDK_PLATFORM_LEVEL ?= 8 -NDK_TOOLCHAIN_VERSION=4.6 -NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm -NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'` -NDK_PROCESSOR:=`uname -m` - -#NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) -NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) - -# to use the real HOST tag, you need the latest libtool files: -# http://stackoverflow.com/questions/4594736/configure-does-not-recognize-andr... -#HOST := arm-none-linux-gnueabi -HOST := arm-linux-androideabi - -# install root for built files -DESTDIR = $(EXTERNAL_ROOT) -# TODO try adding the Android-style /data/app.name here -prefix = -LOCAL := $(DESTDIR)$(prefix) - -export PATH := ${PATH}:$(NDK_TOOLCHAIN)/bin:$(LOCAL)/bin - -CC := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-gcc --sysroot=$(NDK_SYSROOT) -CXX := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-g++ -CPP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-cpp -LD := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ld -AR := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ar -RANLIB := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-ranlib -STRIP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-strip \ +EXTERNAL_ROOT := $(shell pwd) + +# Android now has 64-bit and 32-bit versions of the NDK for GNU/Linux. We +# assume that the build platform uses the appropriate version, otherwise the +# user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN. +CPU := $(shell uname -m) +ifeq ($(CPU),x86_64) + NDK_PROCESSOR=x86_64 +else + NDK_PROCESSOR=x86 +endif + +# Android NDK setup +NDK_BASE ?= /opt/android-ndk +NDK_ABI=arm +APP_ABI=armeabi +# NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion +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.7 +NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') +ifeq ($(NDK_ABI),x86) + HOST = i686-linux-android + NDK_TOOLCHAIN = $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION) +else + HOST = $(NDK_ABI)-linux-androideabi + NDK_TOOLCHAIN = $(HOST)-$(NDK_TOOLCHAIN_VERSION) +endif +NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) + +# include Android's build flags +TARGET_ARCH_ABI = $(APP_ABI) +include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk + +CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT) +CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ +CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp +LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld +AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar +RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib +STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ --strip-unneeded -R .note -R .comment

-CFLAGS = -DANDROID -I$(LOCAL) -I$(LOCAL)/include -I$(NDK_SYSROOT)/usr/include -LDFLAGS = -L$(LOCAL) -L$(LOCAL)/lib -L$(NDK_SYSROOT)/usr/lib - -# build as small as possible, mostly useful for static binaries -CFLAGS += -fdata-sections -ffunction-sections -Os -LDFLAGS += -Wl,--gc-sections +CFLAGS = -DANDROID $(TARGET_CFLAGS) +LDFLAGS = -llog $(TARGET_LDFLAGS) + +# change 'release' to 'debug' for unoptimized debug builds +ifeq ($(APP_ABI),armeabi-v7a) + CFLAGS += $(TARGET_arm_release_CFLAGS) +endif +ifeq ($(APP_ABI),armeabi) + CFLAGS += $(TARGET_thumb_release_CFLAGS) +endif + +.PHONY = clean showsetup \ + assets assets-clean \ + openssl-static openssl-static-clean \ + libevent libevent-clean \ + iptables iptables-clean \ + tor tor-clean \ + obfsproxy obfsproxy-clean \ + privoxy privoxy-clean

all: assets

@@ -158,7 +176,6 @@ tor/Makefile: tor/configure LIBS="-L$(EXTERNAL_ROOT)/lib" CFLAGS="-I$(EXTERNAL_ROOT)/include -I$(EXTERNAL_ROOT)/include/event2" \ ./configure \ --host=$(HOST) \ - --prefix=$(NDK_TOOLCHAIN) \ --disable-asciidoc \ --enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \ --enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \ @@ -197,7 +214,6 @@ obfsproxy/Makefile: libcrypto_LIBS="-L$(EXTERNAL_ROOT)/lib -lcrypto" libcrypto_CFLAGS="-I$(EXTERNAL_ROOT)/include" \ ./configure \ --host=$(HOST) \ - --prefix=$(NDK_TOOLCHAIN) \

obfsproxy-build-stamp: obfsproxy/Makefile $(MAKE) -C obfsproxy @@ -319,3 +335,19 @@ assets-clean: # cleanup, cleanup, put the toys away

clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean + + +#------------------------------------------------------------------------------# +# debugging stuff + +showsetup: + @echo "NDK_TOOLCHAIN_VERSION: $(NDK_TOOLCHAIN_VERSION)" + @echo "NDK_TOOLCHAIN: $(NDK_TOOLCHAIN)" + @echo "NDK_SYSROOT: $(NDK_SYSROOT)" + @echo "APP_PLATFORM: $(APP_PLATFORM)" + @echo "APP_ABI: $(APP_ABI)" + @echo "HOST: $(HOST)" + @echo "CC: $(CC)" + @echo "LD: $(LD)" + @echo "CFLAGS: $(CFLAGS)" + @echo "LDFLAGS: $(LDFLAGS)"