| Index: third_party/WebKit/Source/config.gyp
|
| diff --git a/third_party/WebKit/Source/config.gyp b/third_party/WebKit/Source/config.gyp
|
| index 9d5e020c235d061c8eb71c4fbc4bf296af881930..7874b976c84a15c5acf8363e6e043bc034615749 100644
|
| --- a/third_party/WebKit/Source/config.gyp
|
| +++ b/third_party/WebKit/Source/config.gyp
|
| @@ -32,10 +32,6 @@
|
| # If set to 1, doesn't compile debug symbols into webcore reducing the
|
| # size of the binary and increasing the speed of gdb. gcc only.
|
| 'remove_webcore_debug_symbols%': 0,
|
| - # Enables the Oilpan garbage-collection infrastructure.
|
| - # If you update the default value below, be sure to update the one in
|
| - # build/features.gypi, too!
|
| - 'enable_oilpan%': 1,
|
| # If set to 1 (default) and using clang, the Blink GC plugin will check the
|
| # usage of the garbage-collection infrastructure during compilation.
|
| 'blink_gc_plugin%': 1,
|
| @@ -96,13 +92,13 @@
|
| }],
|
| # Only enable the blink_gc_plugin when using clang and chrome plugins.
|
| ['blink_gc_plugin==1 and clang==1 and clang_use_chrome_plugins==1', {
|
| - 'cflags': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'],
|
| + 'cflags': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py <(blink_gc_plugin_flags))'],
|
| 'xcode_settings': {
|
| - 'OTHER_CFLAGS': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'],
|
| + 'OTHER_CFLAGS': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py <(blink_gc_plugin_flags))'],
|
| },
|
| 'msvs_settings': {
|
| 'VCCLCompilerTool': {
|
| - 'AdditionalOptions': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'],
|
| + 'AdditionalOptions': ['<!@(python <(DEPTH)/tools/clang/scripts/blink_gc_plugin_flags.py <(blink_gc_plugin_flags))'],
|
| },
|
| },
|
| }],
|
|
|