diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-15 13:43:58 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-15 13:43:58 +0000 |
| commit | 21e176075ece6e5247b23a4af243baacaa0fac45 (patch) | |
| tree | 401121eeb8e04590a6227da967cd2c5fd85ad683 | |
| parent | 13f6617652072d051fd7a273072217f34c26d145 (diff) | |
| download | freetype-21e176075ece6e5247b23a4af243baacaa0fac45.tar.gz | |
Update makefiles after merge of Chromium at r211635
This commit was generated by merge_from_chromium.py.
Change-Id: Icb7367e9bb5741b1228b1b4c1dcd064a10ac63c0
| -rw-r--r-- | ft2.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
6 files changed, 24 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 8c2f691..7885dd8 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -85,6 +85,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -168,6 +170,8 @@ MY_DEFS_Release := \ '-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' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 162b9c1..65b1fc8 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -84,6 +84,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -166,6 +168,8 @@ MY_DEFS_Release := \ '-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' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index c5cea49..e81f449 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -87,6 +87,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -173,6 +175,8 @@ MY_DEFS_Release := \ '-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' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 8c2f691..7885dd8 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -85,6 +85,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -168,6 +170,8 @@ MY_DEFS_Release := \ '-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' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 162b9c1..65b1fc8 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -84,6 +84,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -166,6 +168,8 @@ MY_DEFS_Release := \ '-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' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index c5cea49..e81f449 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -87,6 +87,8 @@ MY_DEFS_Debug := \ '-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' \ @@ -173,6 +175,8 @@ MY_DEFS_Release := \ '-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' \ |