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

use PIEFLAGS

This commit is contained in:
Nathan Freitas 2016-11-03 11:00:12 -04:00
parent 0050bfeb95
commit 5ac21be984
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
external/Makefile vendored
View File

@ -23,11 +23,14 @@ endif
# Android NDK setup # Android NDK setup
ANDROID_NDK_HOME ?= /opt/android-ndk ANDROID_NDK_HOME ?= /opt/android-ndk
NDK_PLATFORM_LEVEL ?= 16 NDK_PLATFORM_LEVEL ?= 21
NDK_TOOLCHAIN_VERSION=4.8 NDK_TOOLCHAIN_VERSION=4.9
APP_ABI ?= armeabi APP_ABI ?= armeabi
NDK_ABI ?= $(APP_ABI) NDK_ABI ?= $(APP_ABI)
PIE_MODE ?= pie
# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets
PIEFLAGS ?= -fPIE -pie
ifneq ($(filter arm%, $(APP_ABI)),) ifneq ($(filter arm%, $(APP_ABI)),)
NDK_ABI := arm NDK_ABI := arm
endif endif
@ -71,11 +74,6 @@ RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib
STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \
--strip-unneeded -R .note -R .comment --strip-debug --strip-unneeded -R .note -R .comment --strip-debug
# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets
PIEFLAGS ?= -fPIE -pie
ifeq ($(PIEMODE),nopie)
PIEFLAGS =
endif
CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS) CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS)
LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS)