| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 645c337a3c1f4b6f31544e8e6aeb6f580eeb4491..7f16b21c3f8e127873bde7c597bbd9524c1c3786 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -320,9 +320,6 @@
|
| # whether to compile in the sources for the GPU plugin / process.
|
| 'enable_gpu%': 1,
|
|
|
| - # Use GConf, the GNOME configuration system.
|
| - 'use_gconf%': 1,
|
| -
|
| # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
|
| 'use_openssl%': 0,
|
|
|
| @@ -443,6 +440,13 @@
|
| 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
|
| }], # use_libjpeg_turbo==1
|
|
|
| + # Use GConf, the GNOME configuration system.
|
| + ['chromeos==1', {
|
| + 'use_gconf%': 0,
|
| + }, {
|
| + 'use_gconf%': 1,
|
| + }],
|
| +
|
| # Setup -D flags passed into grit.
|
| ['chromeos==1', {
|
| 'grit_defines': ['-D', 'chromeos'],
|
|
|