Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Unified Diff: build/common.gypi

Issue 6268008: Remove gconf build dependence for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698