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

Unified Diff: build/common.gypi

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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 | chrome/app/generated_resources.grd » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')
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 72eb96d94c07528ee98e90e0bdf56958f8bef7b5..d6fff92783af3e7adb95c2ce16da21f84162dbec 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -515,6 +515,7 @@
'spdy_proxy_auth_value%' : '',
'data_reduction_proxy_probe_url%' : '',
'enable_mdns%' : 0,
+ 'enable_service_discovery%': 0,
'enable_enhanced_bookmarks%': 0,
'enable_hangout_services_extension%': 0,
@@ -994,6 +995,7 @@
'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
'enable_mdns%' : '<(enable_mdns)',
+ 'enable_service_discovery%' : '<(enable_service_discovery)',
'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)',
'v8_optimized_debug%': '<(v8_optimized_debug)',
@@ -1797,9 +1799,6 @@
['enable_webrtc==1', {
'grit_defines': ['-D', 'enable_webrtc'],
}],
- ['enable_mdns==1', {
- 'grit_defines': ['-D', 'enable_mdns'],
- }],
['enable_enhanced_bookmarks==1', {
'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
}],
@@ -1815,6 +1814,10 @@
['enable_resource_whitelist_generation==1', {
'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("{textual_id}") {numeric_id}'],
}],
+ ['enable_mdns==1 or OS=="mac"', {
+ 'grit_defines': ['-D', 'enable_service_discovery'],
+ 'enable_service_discovery%': 1
+ }],
['clang_use_chrome_plugins==1 and OS!="win"', {
'clang_chrome_plugins_flags': [
'<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
@@ -2492,6 +2495,9 @@
['enable_mdns==1', {
'defines': ['ENABLE_MDNS=1'],
}],
+ ['enable_service_discovery==1', {
+ 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
+ }],
['enable_enhanced_bookmarks==1', {
'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'],
}],
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698