Commit 1c6fe293 authored by petkov@chromium.org's avatar petkov@chromium.org

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
parent 198e9a60
...@@ -320,9 +320,6 @@ ...@@ -320,9 +320,6 @@
# whether to compile in the sources for the GPU plugin / process. # whether to compile in the sources for the GPU plugin / process.
'enable_gpu%': 1, '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 instead of NSS. Under development: see http://crbug.com/62803
'use_openssl%': 0, 'use_openssl%': 0,
...@@ -443,6 +440,13 @@ ...@@ -443,6 +440,13 @@
'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
}], # use_libjpeg_turbo==1 }], # use_libjpeg_turbo==1
# Use GConf, the GNOME configuration system.
['chromeos==1', {
'use_gconf%': 0,
}, {
'use_gconf%': 1,
}],
# Setup -D flags passed into grit. # Setup -D flags passed into grit.
['chromeos==1', { ['chromeos==1', {
'grit_defines': ['-D', 'chromeos'], 'grit_defines': ['-D', 'chromeos'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment