From f6771f631b814189d83b9b16cfa73d1466f932af Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Mon, 14 Jul 2014 23:32:28 -0700 Subject: [PATCH] reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge. Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161 --- core/combo/TARGET_linux-x86.mk | 2 +- core/combo/TARGET_linux-x86_64.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 4370db8f3d..2ca99ef548 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -112,7 +112,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ -Wstrict-aliasing=2 \ - -fPIC -fPIE \ + -fPIC \ -ffunction-sections \ -finline-functions \ -finline-limit=300 \ diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index f6a9fc86e9..9dbcc19e9e 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -110,7 +110,7 @@ TARGET_GLOBAL_CFLAGS += \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ -Wstrict-aliasing=2 \ - -fPIC -fPIE \ + -fPIC \ -ffunction-sections \ -finline-functions \ -finline-limit=300 \