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

Unified Diff: build/config/features.gni

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 8ca446dd43d9386c52977656d591e4820d447bdc..e5dcc536b359280f52922be0a2c0e3928c8fbea8 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -23,7 +23,7 @@ declare_args() {
# Multicast DNS.
enable_mdns = is_win || is_linux
- enable_plugins = !is_android && !is_ios
+ enable_plugins = !is_ios
# Enables Native Client support.
# TODO(GYP): Get NaCl linking on other platforms.
@@ -51,7 +51,7 @@ declare_args() {
enable_webrtc = !is_ios && !is_mac && !is_android
# Enables the Media Router.
- enable_media_router = !is_ios
+ enable_media_router = !is_ios && !is_android
# Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3.
# Android OS includes support for proprietary codecs regardless of building
@@ -64,13 +64,13 @@ declare_args() {
enable_configuration_policy = !is_ios
# Enables support for background apps.
- enable_background = !is_ios && !is_android
+ enable_background = !is_ios && (!is_android || use_aura)
enable_captive_portal_detection = !is_android && !is_ios
# Enables use of the session service, which is enabled by default.
# Android stores them separately on the Java side.
- enable_session_service = !is_android && !is_ios
+ enable_session_service = (!is_android || use_aura) && !is_ios
enable_plugin_installation = is_win || is_mac
@@ -163,13 +163,13 @@ enable_web_speech = !is_android && !is_ios
use_dbus = is_linux
-enable_extensions = !is_android && !is_ios
+enable_extensions = !is_ios
enable_task_manager = !is_ios && !is_android
use_cups = is_desktop_linux || is_mac
-enable_themes = !is_android && !is_ios
+enable_themes = (!is_android && !is_ios) || (is_android && use_aura)
# TODO(scottmg) remove this when we've fixed printing.
win_pdf_metafile_for_printing = true

Powered by Google App Engine
This is Rietveld 408576698