Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
diff --git a/net/http_server.target.darwin-mips.mk b/net/http_server.target.darwin-mips.mk
index 7d219c6..82c2a93 100644
--- a/net/http_server.target.darwin-mips.mk
+++ b/net/http_server.target.darwin-mips.mk
@@ -56,14 +56,15 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
+ -Wno-unused-but-set-variable \
-Os \
-g \
-fomit-frame-pointer \
-fdata-sections \
- -ffunction-sections
+ -ffunction-sections \
+ -funwind-tables
MY_DEFS_Debug := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -74,7 +75,6 @@
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
@@ -111,7 +111,6 @@
-fvisibility-inlines-hidden \
-Wsign-compare \
-Wno-uninitialized \
- -Wno-error=c++0x-compat \
-Wno-non-virtual-dtor \
-Wno-sign-promo
@@ -142,14 +141,15 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
+ -Wno-unused-but-set-variable \
-Os \
-fno-ident \
-fdata-sections \
-ffunction-sections \
- -fomit-frame-pointer
+ -fomit-frame-pointer \
+ -funwind-tables
MY_DEFS_Release := \
- '-DANGLE_DX11' \
'-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
@@ -160,7 +160,6 @@
'-DENABLE_CONFIGURATION_POLICY' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
@@ -198,7 +197,6 @@
-fvisibility-inlines-hidden \
-Wsign-compare \
-Wno-uninitialized \
- -Wno-error=c++0x-compat \
-Wno-non-virtual-dtor \
-Wno-sign-promo