Index: build/config/features.gni |
diff --git a/build/config/features.gni b/build/config/features.gni |
index 9953a0d88e72da1f9375ae4a7260bcb5f13d8a03..ac48896601a78e999142b392c24dd3f77cf1b201 100644 |
--- a/build/config/features.gni |
+++ b/build/config/features.gni |
@@ -75,7 +75,7 @@ enable_print_preview = !is_android |
# Do not disable seccomp_bpf anywhere without talking to |
# security@chromium.org! |
use_seccomp_bpf = (is_linux || is_android) && |
- (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm") |
+ (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm") |
# Enable notifications everywhere except iOS. |
enable_notifications = !is_ios |
@@ -83,18 +83,20 @@ enable_notifications = !is_ios |
# TODO(brettw) this should be moved to net and only dependents get this define. |
disable_ftp_support = is_ios |
-enable_web_speech = (!is_android && !is_ios) |
+enable_web_speech = !is_android && !is_ios |
use_dbus = is_linux |
-enable_extensions = (!is_android && !is_ios) |
+enable_extensions = !is_android && !is_ios |
# Variable safe_browsing is used to control the build time configuration for |
# safe browsing feature. Safe browsing can be compiled in 3 different levels: 0 |
# disables it, 1 enables it fully, and 2 enables only UI and reporting features |
# without enabling phishing and malware detection. This is useful to integrate |
# a third party phishing/malware detection to existing safe browsing logic. |
-if (is_ios) { |
+if (is_android) { |
+ safe_browsing_mode = 2 |
+} else if (is_ios) { |
safe_browsing_mode = 0 |
} else { |
safe_browsing_mode = 1 |
@@ -129,7 +131,7 @@ enable_plugin_installation = is_win || is_mac |
enable_app_list = !is_ios && !is_android |
enable_settings_app = enable_app_list && !is_chromeos |
-enable_managed_users = !is_ios |
+enable_supervised_users = !is_ios |
enable_service_discovery = enable_mdns || is_mac |
@@ -157,3 +159,8 @@ use_brlapi = is_chromeos |
# system). |
# TODO(GYP) also require !embedded to enable. |
use_gconf = is_linux && !is_chromeos |
+ |
+# Hangout services is an extension that adds extra features to Hangouts. |
+# For official GYP builds, this flag is set, it will likely need to be |
+# parameterized in the future for a similar use. |
+enable_hangout_services_extension = false |