summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.gypi10
1 files changed, 7 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 645c337..7f16b21 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'],