diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
| commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
| tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /url/url_lib.target.darwin-x86.mk | |
| parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
| download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz | |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'url/url_lib.target.darwin-x86.mk')
| -rw-r--r-- | url/url_lib.target.darwin-x86.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/url/url_lib.target.darwin-x86.mk b/url/url_lib.target.darwin-x86.mk index 477f28c23f..7e3c4501c2 100644 --- a/url/url_lib.target.darwin-x86.mk +++ b/url/url_lib.target.darwin-x86.mk @@ -83,8 +83,9 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ - '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ @@ -171,8 +172,9 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ - '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ |