Update makefiles after merge of Chromium at r205892
This commit was generated by merge_from_chromium.py.
Change-Id: I64163b2cccbb7f7c34760545d67a916e93eb75e7
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 1e21057..7575f1c 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -81,7 +81,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 7b01869..ed3334f 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -83,7 +83,6 @@
'-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/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 7dc1f9a..614c529 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -83,7 +83,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 1e21057..7575f1c 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -81,7 +81,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 7b01869..ed3334f 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -83,7 +83,6 @@
'-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/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 7dc1f9a..614c529 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -83,7 +83,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index aa97b8f..ae2313c 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -105,7 +105,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk
index 375f562..d8823c9 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator_common.target.darwin-mips.mk
@@ -107,7 +107,6 @@
'-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/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index ab5c701..885896a 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -107,7 +107,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index aa97b8f..ae2313c 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -105,7 +105,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
index 375f562..d8823c9 100644
--- a/src/translator_common.target.linux-mips.mk
+++ b/src/translator_common.target.linux-mips.mk
@@ -107,7 +107,6 @@
'-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/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index ab5c701..885896a 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -107,7 +107,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index db10447..82dff6d 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -78,7 +78,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
index b78a2ec..b82e407 100644
--- a/src/translator_glsl.target.darwin-mips.mk
+++ b/src/translator_glsl.target.darwin-mips.mk
@@ -80,7 +80,6 @@
'-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/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index 0160f75..d9e11d8 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -80,7 +80,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index db10447..82dff6d 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -78,7 +78,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
index b78a2ec..b82e407 100644
--- a/src/translator_glsl.target.linux-mips.mk
+++ b/src/translator_glsl.target.linux-mips.mk
@@ -80,7 +80,6 @@
'-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/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index 0160f75..d9e11d8 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -80,7 +80,6 @@
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
