diff options
| author | petkov@chromium.org <petkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 22:14:31 +0000 |
|---|---|---|
| committer | petkov@chromium.org <petkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 22:14:31 +0000 |
| commit | 1c6fe29300df95b97ffa5ed87e61eef04ab385a0 (patch) | |
| tree | 90d384a0063853daa4c13c74ff5d08e48b85ece7 /build/common.gypi | |
| parent | 198e9a60d8d841455a65a0a6e2265d50decfb82c (diff) | |
| download | chromium_src-1c6fe29300df95b97ffa5ed87e61eef04ab385a0.zip chromium_src-1c6fe29300df95b97ffa5ed87e61eef04ab385a0.tar.gz chromium_src-1c6fe29300df95b97ffa5ed87e61eef04ab385a0.tar.bz2 | |
Remove gconf build dependence for Chrome OS.
BUG=chromium-os:430
TEST=try bots (win, linux, linux_chromeos); tested on device
Review URL: http://codereview.chromium.org/6268008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 10 |
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'], |