Update makefiles after merge of Chromium at b62471bd5180
This commit was generated by merge_from_chromium.py.
Change-Id: I34739eb041976d8d3e0bc2579531109faa1e5ee6
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 980bf5c..847cf86 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -64,7 +64,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -146,6 +145,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -162,7 +162,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -245,6 +244,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \