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

Unified Diff: build/common.gypi

Issue 951713002: Add enable_media_router defines for GN and gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed global define. Created 5 years, 10 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
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index cf560eee2201d5adf15aae13289d3d30f04929a7..810a43767aa700eb7cf9112c68334204c5e7105a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -512,6 +512,9 @@
# Webrtc compilation is enabled by default. Set to 0 to disable.
'enable_webrtc%': 1,
+ # Media router support is enabled by default. Set to 0 to disable.
+ 'enable_media_router%': 1,
DaleCurtis 2015/02/24 00:24:22 Do you plan to upstream with this on by default?
Kevin M 2015/02/24 01:49:43 Yes. We'll want it on so that we can benefit from
+
# Enables use of the session service, which is enabled by default.
# Support for disabling depends on the platform.
'enable_session_service%': 1,
@@ -870,8 +873,10 @@
['OS=="android" or OS=="ios"', {
'enable_captive_portal_detection%': 0,
+ 'enable_media_router%': 0,
}, {
'enable_captive_portal_detection%': 1,
+ 'enable_media_router%': 1,
}],
# Enable Skia UI text drawing incrementally on different platforms.
@@ -1111,6 +1116,7 @@
'remoting%': '<(remoting)',
'enable_one_click_signin%': '<(enable_one_click_signin)',
'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
+ 'enable_media_router%': '<(enable_media_router)',
'enable_webrtc%': '<(enable_webrtc)',
'chromium_win_pch%': '<(chromium_win_pch)',
'configuration_policy%': '<(configuration_policy)',
@@ -2114,6 +2120,9 @@
['use_concatenated_impulse_responses==1', {
'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
}],
+ ['enable_media_router==1', {
+ 'grit_defines': ['-D', 'enable_media_router'],
+ }],
['enable_webrtc==1', {
'grit_defines': ['-D', 'enable_webrtc'],
}],
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698