commit f6771f631b814189d83b9b16cfa73d1466f932af
author Ed Heyl <edheyl@google.com> Mon Jul 14 23:32:28 2014 -0700
committer Ed Heyl <edheyl@google.com> Mon Jul 14 23:32:28 2014 -0700
tree ef17465cb774620b1fc8f1f40e925345ed2979e2
parent 4f892ab728798dab39812e2dcf38bec5b2a112ea

reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge.

Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 4370db8..2ca99ef 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -112,7 +112,7 @@
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \
 			-Wstrict-aliasing=2 \
-			-fPIC -fPIE \
+			-fPIC \
 			-ffunction-sections \
 			-finline-functions \
 			-finline-limit=300 \

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index f6a9fc8..9dbcc19 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -110,7 +110,7 @@
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \
 			-Wstrict-aliasing=2 \
-			-fPIC -fPIE \
+			-fPIC \
 			-ffunction-sections \
 			-finline-functions \
 			-finline-limit=300 \