commit ac9861b1e86791daa3728a7d285e4b84cfd16959
author Torne (Richard Coles) <torne@google.com> Wed Sep 10 10:54:35 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Wed Sep 10 10:54:35 2014 +0100
tree e46c53d074371554c5b5206144d73c20263fb813
parent a48c6b2c10223e9263a90092794da468d1269081

Update makefiles after merge

Change-Id: Ib123e2cb281ae812cb831c16e2da599bfbc7a2bb

ots.target.linux-x86_64.mk

diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 4c7e906..e72c139 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -151,6 +151,8 @@
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	-fstack-protector \
@@ -246,7 +248,10 @@
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Release := false
+
 LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION))
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
 LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
 LOCAL_ASFLAGS := $(LOCAL_CFLAGS)