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.darwin-arm.mk b/ots.target.darwin-arm.mk
index 9308945..5c63e22 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -64,7 +64,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -152,6 +151,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -169,7 +169,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -258,6 +257,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 218ccbe..11af240 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -63,7 +63,6 @@
MY_CFLAGS_Debug := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -141,6 +140,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -156,7 +156,6 @@
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -235,6 +234,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -258,6 +258,7 @@
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--dynamic-linker=/system/bin/linker64 \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
@@ -272,6 +273,7 @@
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--dynamic-linker=/system/bin/linker64 \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 24eb18b..d9a5ce1 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -64,7 +64,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
\
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -144,6 +143,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -161,7 +161,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
\
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -242,6 +241,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 37b66e6..580ec4c 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -63,7 +63,6 @@
MY_CFLAGS_Debug := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -147,6 +146,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 @@
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -247,6 +246,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 980bf5c..847cf86 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-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 \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 9308945..5c63e22 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -64,7 +64,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -152,6 +151,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -169,7 +169,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -258,6 +257,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 218ccbe..11af240 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -63,7 +63,6 @@
MY_CFLAGS_Debug := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -141,6 +140,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -156,7 +156,6 @@
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -235,6 +234,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -258,6 +258,7 @@
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--dynamic-linker=/system/bin/linker64 \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
@@ -272,6 +273,7 @@
-Wl,--fatal-warnings \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--dynamic-linker=/system/bin/linker64 \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 24eb18b..d9a5ce1 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -64,7 +64,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
\
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -144,6 +143,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Debug := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -161,7 +161,6 @@
-fstack-protector \
--param=ssp-buffer-size=4 \
\
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -242,6 +241,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 37b66e6..580ec4c 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -63,7 +63,6 @@
MY_CFLAGS_Debug := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -147,6 +146,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 @@
MY_CFLAGS_Release := \
--param=ssp-buffer-size=4 \
-Werror \
- -fno-exceptions \
-fno-strict-aliasing \
-Wall \
-Wno-unused-parameter \
@@ -247,6 +246,7 @@
# Flags passed to only C++ (and not C) files.
LOCAL_CPPFLAGS_Release := \
+ -fno-exceptions \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
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 \
