Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
diff --git a/net/net.target.darwin-mips.mk b/net/net.target.darwin-mips.mk
index b1a8fd8..0140d96 100644
--- a/net/net.target.darwin-mips.mk
+++ b/net/net.target.darwin-mips.mk
@@ -151,6 +151,7 @@
net/disk_cache/simple/simple_entry_impl.cc \
net/disk_cache/simple/simple_index.cc \
net/disk_cache/simple/simple_index_file.cc \
+ net/disk_cache/simple/simple_net_log_parameters.cc \
net/disk_cache/simple/simple_synchronous_entry.cc \
net/disk_cache/simple/simple_util.cc \
net/disk_cache/flash/flash_entry_impl.cc \
@@ -296,6 +297,7 @@
net/quic/crypto/null_decrypter.cc \
net/quic/crypto/null_encrypter.cc \
net/quic/crypto/p256_key_exchange_openssl.cc \
+ net/quic/crypto/proof_source_chromium.cc \
net/quic/crypto/proof_verifier_chromium.cc \
net/quic/crypto/quic_decrypter.cc \
net/quic/crypto/quic_encrypter.cc \
@@ -477,6 +479,8 @@
'-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
@@ -567,6 +571,8 @@
'-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DDISABLE_NACL' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \