Update makefiles after merge
Change-Id: Ib123e2cb281ae812cb831c16e2da599bfbc7a2bb
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 4821eda..5b41e71 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -158,6 +158,8 @@
-Wno-sign-promo
+LOCAL_FDO_SUPPORT_Debug := false
+
# Flags passed to both C and C++ files.
MY_CFLAGS_Release := \
-fstack-protector \
@@ -260,7 +262,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)