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

update Makefile with a few tweaks

This commit is contained in:
Nathan Freitas 2015-05-12 02:27:07 -04:00
parent 2f8c130f02
commit d6ff4131db
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
external/Makefile vendored
View File

@ -24,10 +24,9 @@ endif
# Android NDK setup # Android NDK setup
NDK_BASE ?= /opt/android-ndk NDK_BASE ?= /opt/android-ndk
NDK_PLATFORM_LEVEL ?= 16 NDK_PLATFORM_LEVEL ?= 16
NDK_TOOLCHAIN_VERSION=4.8 NDK_TOOLCHAIN_VERSION=4.9
APP_ABI ?= armeabi APP_ABI ?= armeabi
NDK_ABI ?= $(APP_ABI)
NDK_ABI := $(APP_ABI)
ifneq ($(filter arm%, $(APP_ABI)),) ifneq ($(filter arm%, $(APP_ABI)),)
NDK_ABI := arm NDK_ABI := arm
endif endif
@ -198,7 +197,7 @@ iptables/Makefile:
cp config.guess iptables cp config.guess iptables
cd iptables && \ cd iptables && \
CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
./configure --host=$(HOST) --disable-shared --enable-static ./configure --host=$(HOST) --disable-shared --enable-static
iptables-build-stamp: iptables/Makefile iptables-build-stamp: iptables/Makefile
$(MAKE) -C iptables $(MAKE) -C iptables
@ -299,13 +298,10 @@ assets: tor polipo jtorctl iptables
install -d ../libs install -d ../libs
install bin/jtorctl.jar ../libs install bin/jtorctl.jar ../libs
install -d ../assets/$(APP_ABI) install -d ../assets/$(APP_ABI)
## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug
-$(STRIP) bin/polipo -$(STRIP) bin/polipo
-zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo -zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo
## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor
-$(STRIP) bin/tor -$(STRIP) bin/tor
-zip ../assets/$(APP_ABI)/tor.mp3 bin/tor -zip ../assets/$(APP_ABI)/tor.mp3 bin/tor
## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables
-$(STRIP) bin/xtables -$(STRIP) bin/xtables
-zip ../assets/$(APP_ABI)/xtables.mp3 bin/xtables -zip ../assets/$(APP_ABI)/xtables.mp3 bin/xtables