Chromium Code Reviews| Index: build/config/features.gni |
| diff --git a/build/config/features.gni b/build/config/features.gni |
| index 41b53e6bea8092e88f1e9fd2273a8ecd6aad4e5f..29446ede223b78994039bba8612957c307457aab 100644 |
| --- a/build/config/features.gni |
| +++ b/build/config/features.gni |
| @@ -16,6 +16,7 @@ |
| import("//build/config/chrome_build.gni") |
| import("//build/config/chromecast_build.gni") |
| +import("//build/config/headless_build.gni") |
| if (is_android) { |
| import("//build/config/android/config.gni") |
| } |
| @@ -24,8 +25,8 @@ declare_args() { |
| # Multicast DNS. |
| enable_mdns = is_win || is_linux |
| - enable_plugins = (!is_android && !is_ios) || is_chromecast |
| - enable_pdf = !is_android && !is_ios && !is_chromecast |
| + enable_plugins = ((!is_android && !is_ios) || is_chromecast) && !is_headless |
| + enable_pdf = !is_android && !is_ios && !is_chromecast && !is_headless |
|
jam
2015/10/26 17:05:31
it's not clear to me why this should be the cast;
Sami
2015/10/26 18:09:06
I suppose you're right. I was thinking NPAPI proba
|
| # Enables Native Client support. |
| # TODO(GYP): Get NaCl linking on other platforms. |
| @@ -86,7 +87,7 @@ declare_args() { |
| enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos) |
| - enable_remoting = !is_ios && !is_android && !is_chromecast |
| + enable_remoting = !is_ios && !is_android && !is_chromecast && !is_headless |
| # Enable hole punching for the protected video. |
| enable_video_hole = is_android |
| @@ -125,7 +126,7 @@ declare_args() { |
| cld_version = 2 |
| # libudev usage. This currently only affects the content layer. |
| -use_udev = is_linux && !is_chromecast |
| +use_udev = is_linux && !is_chromecast && !is_headless |
| # Enable the spell checker. |
| enable_spellcheck = !is_ios |
| @@ -134,11 +135,12 @@ enable_spellcheck = !is_ios |
| use_browser_spellchecker = is_android || is_mac |
| # Enable basic printing support and UI. |
| -enable_basic_printing = !is_chromeos && !is_chromecast && !is_ios |
| +enable_basic_printing = |
| + !is_chromeos && !is_chromecast && !is_ios && !is_headless |
| # Enable printing with print preview. It does not imply |
| # enable_basic_printing. It's possible to build Chrome with preview only. |
| -enable_print_preview = !is_android && !is_chromecast && !is_ios |
| +enable_print_preview = !is_android && !is_chromecast && !is_ios && !is_headless |
| # Enables the use of CDMs in pepper plugins. |
| enable_pepper_cdms = |
| @@ -160,13 +162,13 @@ disable_ftp_support = is_ios |
| enable_web_speech = !is_android && !is_ios |
| -use_dbus = is_linux && !is_chromecast |
| +use_dbus = is_linux && !is_chromecast && !is_headless |
| enable_extensions = !is_android && !is_ios |
| enable_task_manager = !is_ios && !is_android |
| -use_cups = (is_desktop_linux || is_mac) && !is_chromecast |
| +use_cups = (is_desktop_linux || is_mac) && !is_chromecast && !is_headless |
| enable_themes = !is_android && !is_ios |
| @@ -196,7 +198,7 @@ use_brlapi = is_chromeos |
| # Option controlling the use of GConf (the classic GNOME configuration |
| # system). |
| -use_gconf = is_linux && !is_chromeos && !is_chromecast |
| +use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless |
| # Whether to back up data before sync. |
| enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) |
| @@ -204,3 +206,5 @@ enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) |
| # Enable WebVR support by default on Android |
| # Still requires command line flag to access API |
| enable_webvr = is_android |
| + |
| +use_gio = is_desktop_linux && !is_headless |