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 | 900af0f0806482e9498ec29698030f4c54e52a36 (patch) | |
| tree | 17c5861cbc5be185b99be5371f78ff40c69063ee | |
| parent | 63f507926cf47137fd70b582b67c5c25f4d2891b (diff) | |
| download | openssl-900af0f0806482e9498ec29698030f4c54e52a36.tar.gz | |
Update makefiles after merge of Chromium at r205892
This commit was generated by merge_from_chromium.py.
Change-Id: Ib9e121c26835a594d012a1222f175983af94109e
| -rw-r--r-- | openssl.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 0cd2c23..f5fa163 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -621,7 +621,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/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index aa5dc2c..90e78a5 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -620,7 +620,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/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index c9e9aad..243ab58 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -626,7 +626,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/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 0cd2c23..f5fa163 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -621,7 +621,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/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index aa5dc2c..90e78a5 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -620,7 +620,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/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index c9e9aad..243ab58 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -626,7 +626,6 @@ MY_DEFS := \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ - '-DENABLE_PARTITION_ALLOC=1' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ |