From 900af0f0806482e9498ec29698030f4c54e52a36 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 12 Jun 2013 19:37:13 +0000 Subject: Update makefiles after merge of Chromium at r205892 This commit was generated by merge_from_chromium.py. Change-Id: Ib9e121c26835a594d012a1222f175983af94109e --- openssl.target.darwin-arm.mk | 1 - openssl.target.darwin-mips.mk | 1 - openssl.target.darwin-x86.mk | 1 - openssl.target.linux-arm.mk | 1 - openssl.target.linux-mips.mk | 1 - openssl.target.linux-x86.mk | 1 - 6 files changed, 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' \ -- cgit v1.2.3