diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-06-12 19:37:13 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-06-12 19:37:13 +0000 |
| commit | e7ead896227f574d532dd652bcfaa3645b1d69fd (patch) | |
| tree | e731bc5e230c5eec8acca5b817aae0b83a0d9b59 | |
| parent | b86b52b9e33a6412242a5ef0860e5cb85075b713 (diff) | |
| download | freetype-e7ead896227f574d532dd652bcfaa3645b1d69fd.tar.gz | |
Update makefiles after merge of Chromium at r205892
This commit was generated by merge_from_chromium.py.
Change-Id: I72a0c7cf2c8a7b7751d5e28b37d0596c73b4e165
| -rw-r--r-- | ft2.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 191a0d1..55cf8c2 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -87,7 +87,6 @@ MY_DEFS := \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index e7f2d34..58c002f 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -89,7 +89,6 @@ MY_DEFS := \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 3835568..d4bafd1 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -89,7 +89,6 @@ MY_DEFS := \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 191a0d1..55cf8c2 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -87,7 +87,6 @@ MY_DEFS := \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index e7f2d34..58c002f 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -89,7 +89,6 @@ MY_DEFS := \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 3835568..d4bafd1 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -89,7 +89,6 @@ MY_DEFS := \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ |