From b86b52b9e33a6412242a5ef0860e5cb85075b713 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 12 Jun 2013 04:06:57 +0000 Subject: Update makefiles after merge of Chromium at r205713 This commit was generated by merge_from_chromium.py. Change-Id: I4a909b1a49285bdea6d5954833b9d8f2f25d81e4 --- ft2.target.darwin-arm.mk | 1 + ft2.target.darwin-mips.mk | 1 + ft2.target.darwin-x86.mk | 1 + ft2.target.linux-arm.mk | 1 + ft2.target.linux-mips.mk | 1 + ft2.target.linux-x86.mk | 1 + 6 files changed, 6 insertions(+) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 55cf8c2..191a0d1 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -87,6 +87,7 @@ 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 58c002f..e7f2d34 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -89,6 +89,7 @@ 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 d4bafd1..3835568 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -89,6 +89,7 @@ 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 55cf8c2..191a0d1 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -87,6 +87,7 @@ 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 58c002f..e7f2d34 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -89,6 +89,7 @@ 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 d4bafd1..3835568 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -89,6 +89,7 @@ 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 From e7ead896227f574d532dd652bcfaa3645b1d69fd 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: I72a0c7cf2c8a7b7751d5e28b37d0596c73b4e165 --- ft2.target.darwin-arm.mk | 1 - ft2.target.darwin-mips.mk | 1 - ft2.target.darwin-x86.mk | 1 - ft2.target.linux-arm.mk | 1 - ft2.target.linux-mips.mk | 1 - ft2.target.linux-x86.mk | 1 - 6 files changed, 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' \ -- cgit v1.2.3 From 465c9389cd7f21adc1b8c7af740cafd57eadd8c0 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Wed, 19 Jun 2013 05:48:54 +0000 Subject: Update makefiles after merge of Chromium at r207186 This commit was generated by merge_from_chromium.py. Change-Id: Iba1126bb027209d5e02da7850f8e3d89389f0acc --- ft2.target.darwin-arm.mk | 1 + ft2.target.darwin-mips.mk | 1 + ft2.target.darwin-x86.mk | 1 + ft2.target.linux-arm.mk | 1 + ft2.target.linux-mips.mk | 1 + ft2.target.linux-x86.mk | 1 + 6 files changed, 6 insertions(+) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 55cf8c2..51d39f1 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -83,6 +83,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 58c002f..324b649 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -86,6 +86,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index d4bafd1..79d3c56 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -85,6 +85,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 55cf8c2..51d39f1 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -83,6 +83,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 58c002f..324b649 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -86,6 +86,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index d4bafd1..79d3c56 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -85,6 +85,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ -- cgit v1.2.3