commit 039cd7e076e904dfe6d4c9e2e2d99fb31444b2ad
author Tim Murray <timmurray@google.com> Wed Sep 03 22:46:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 03 22:46:45 2014 +0000
tree a7b0a95cdd1eeb5cbad41d8de822fa3545a40316
parent 7754e0ce894044e43c50e002e342f03317205668
parent 595d0dbd5bbf18107ee2f18c06b033e3aef9374c

Merge "Add LOCAL_NO_FPIE."

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 93ec226..be73c0d 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -151,6 +151,7 @@
 LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH:=
 LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:=
 LOCAL_MODULE_HOST_ARCH:=
+LOCAL_NO_FPIE :=
 
 # arch specific variables
 LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 74fa038..afd033a 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1441,7 +1441,6 @@
 	$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \
 	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
 		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \
-		$(HOST_FPIE_FLAGS) \
 	) \
 	$(PRIVATE_LDFLAGS) \
 	-o $@ \

core/host_executable.mk

diff --git a/core/host_executable.mk b/core/host_executable.mk
index bf3cde1..0091f3f 100644
--- a/core/host_executable.mk
+++ b/core/host_executable.mk
@@ -13,6 +13,10 @@
 endif
 endif
 
+ifeq ($(LOCAL_NO_FPIE),)
+LOCAL_LDFLAGS += $(HOST_FPIE_FLAGS)
+endif
+
 ifeq ($(my_module_multilib),both)
 ifeq ($(LOCAL_MODULE_PATH_32)$(LOCAL_MODULE_STEM_32),)
 $(error $(LOCAL_PATH): LOCAL_MODULE_STEM_32 or LOCAL_MODULE_PATH_32 is required for LOCAL_MULTILIB := both for module $(LOCAL_MODULE))