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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 # 0: Small tables, lower accuracy 505 # 0: Small tables, lower accuracy
506 # 2: Large tables, high accuracy 506 # 2: Large tables, high accuracy
507 'cld2_table_size%': 2, 507 'cld2_table_size%': 2,
508 508
509 # Enable spell checker. 509 # Enable spell checker.
510 'enable_spellcheck%': 1, 510 'enable_spellcheck%': 1,
511 511
512 # Webrtc compilation is enabled by default. Set to 0 to disable. 512 # Webrtc compilation is enabled by default. Set to 0 to disable.
513 'enable_webrtc%': 1, 513 'enable_webrtc%': 1,
514 514
515 # Media router support is enabled by default. Set to 0 to disable.
516 '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
517
515 # Enables use of the session service, which is enabled by default. 518 # Enables use of the session service, which is enabled by default.
516 # Support for disabling depends on the platform. 519 # Support for disabling depends on the platform.
517 'enable_session_service%': 1, 520 'enable_session_service%': 1,
518 521
519 # Enables theme support, which is enabled by default. Support for 522 # Enables theme support, which is enabled by default. Support for
520 # disabling depends on the platform. 523 # disabling depends on the platform.
521 'enable_themes%': 1, 524 'enable_themes%': 1,
522 525
523 # Enables autofill dialog and associated features; disabled by default. 526 # Enables autofill dialog and associated features; disabled by default.
524 'enable_autofill_dialog%' : 0, 527 'enable_autofill_dialog%' : 0,
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 # gcc >= 4.8 or clang. 866 # gcc >= 4.8 or clang.
864 # http://gcc.gnu.org/wiki/DebugFission 867 # http://gcc.gnu.org/wiki/DebugFission
865 ['OS=="linux" and target_arch=="x64"', { 868 ['OS=="linux" and target_arch=="x64"', {
866 'linux_use_debug_fission%': 1, 869 'linux_use_debug_fission%': 1,
867 }, { 870 }, {
868 'linux_use_debug_fission%': 0, 871 'linux_use_debug_fission%': 0,
869 }], 872 }],
870 873
871 ['OS=="android" or OS=="ios"', { 874 ['OS=="android" or OS=="ios"', {
872 'enable_captive_portal_detection%': 0, 875 'enable_captive_portal_detection%': 0,
876 'enable_media_router%': 0,
873 }, { 877 }, {
874 'enable_captive_portal_detection%': 1, 878 'enable_captive_portal_detection%': 1,
879 'enable_media_router%': 1,
875 }], 880 }],
876 881
877 # Enable Skia UI text drawing incrementally on different platforms. 882 # Enable Skia UI text drawing incrementally on different platforms.
878 # http://crbug.com/105550 883 # http://crbug.com/105550
879 # 884 #
880 # On Aura, this allows per-tile painting to be used in the browser 885 # On Aura, this allows per-tile painting to be used in the browser
881 # compositor. 886 # compositor.
882 ['OS!="android"', { 887 ['OS!="android"', {
883 'use_canvas_skia%': 1, 888 'use_canvas_skia%': 1,
884 }], 889 }],
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 'chroot_cmd%': '<(chroot_cmd)', 1109 'chroot_cmd%': '<(chroot_cmd)',
1105 'system_libdir%': '<(system_libdir)', 1110 'system_libdir%': '<(system_libdir)',
1106 'component%': '<(component)', 1111 'component%': '<(component)',
1107 'win_analyze%': '<(win_analyze)', 1112 'win_analyze%': '<(win_analyze)',
1108 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)', 1113 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)',
1109 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)', 1114 'use_titlecase_in_grd%': '<(use_titlecase_in_grd)',
1110 'use_third_party_translations%': '<(use_third_party_translations)', 1115 'use_third_party_translations%': '<(use_third_party_translations)',
1111 'remoting%': '<(remoting)', 1116 'remoting%': '<(remoting)',
1112 'enable_one_click_signin%': '<(enable_one_click_signin)', 1117 'enable_one_click_signin%': '<(enable_one_click_signin)',
1113 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)', 1118 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
1119 'enable_media_router%': '<(enable_media_router)',
1114 'enable_webrtc%': '<(enable_webrtc)', 1120 'enable_webrtc%': '<(enable_webrtc)',
1115 'chromium_win_pch%': '<(chromium_win_pch)', 1121 'chromium_win_pch%': '<(chromium_win_pch)',
1116 'configuration_policy%': '<(configuration_policy)', 1122 'configuration_policy%': '<(configuration_policy)',
1117 'safe_browsing%': '<(safe_browsing)', 1123 'safe_browsing%': '<(safe_browsing)',
1118 'enable_web_speech%': '<(enable_web_speech)', 1124 'enable_web_speech%': '<(enable_web_speech)',
1119 'notifications%': '<(notifications)', 1125 'notifications%': '<(notifications)',
1120 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 1126 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
1121 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 1127 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
1122 'asan%': '<(asan)', 1128 'asan%': '<(asan)',
1123 'asan_blacklist%': '<(asan_blacklist)', 1129 'asan_blacklist%': '<(asan_blacklist)',
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
2107 }], 2113 }],
2108 ['enable_settings_app==1', { 2114 ['enable_settings_app==1', {
2109 'grit_defines': ['-D', 'enable_settings_app'], 2115 'grit_defines': ['-D', 'enable_settings_app'],
2110 }], 2116 }],
2111 ['enable_google_now==1', { 2117 ['enable_google_now==1', {
2112 'grit_defines': ['-D', 'enable_google_now'], 2118 'grit_defines': ['-D', 'enable_google_now'],
2113 }], 2119 }],
2114 ['use_concatenated_impulse_responses==1', { 2120 ['use_concatenated_impulse_responses==1', {
2115 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 2121 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
2116 }], 2122 }],
2123 ['enable_media_router==1', {
2124 'grit_defines': ['-D', 'enable_media_router'],
2125 }],
2117 ['enable_webrtc==1', { 2126 ['enable_webrtc==1', {
2118 'grit_defines': ['-D', 'enable_webrtc'], 2127 'grit_defines': ['-D', 'enable_webrtc'],
2119 }], 2128 }],
2120 ['enable_hangout_services_extension==1', { 2129 ['enable_hangout_services_extension==1', {
2121 'grit_defines': ['-D', 'enable_hangout_services_extension'], 2130 'grit_defines': ['-D', 'enable_hangout_services_extension'],
2122 }], 2131 }],
2123 ['enable_task_manager==1', { 2132 ['enable_task_manager==1', {
2124 'grit_defines': ['-D', 'enable_task_manager'], 2133 'grit_defines': ['-D', 'enable_task_manager'],
2125 }], 2134 }],
2126 ['notifications==1', { 2135 ['notifications==1', {
(...skipping 3795 matching lines...) Expand 10 before | Expand all | Expand 10 after
5922 # settings in target dicts. SYMROOT is a special case, because many other 5931 # settings in target dicts. SYMROOT is a special case, because many other
5923 # Xcode variables depend on it, including variables such as 5932 # Xcode variables depend on it, including variables such as
5924 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5933 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5925 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5934 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5926 # files to appear (when present) in the UI as actual files and not red 5935 # files to appear (when present) in the UI as actual files and not red
5927 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5936 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5928 # and therefore SYMROOT, needs to be set at the project level. 5937 # and therefore SYMROOT, needs to be set at the project level.
5929 'SYMROOT': '<(DEPTH)/xcodebuild', 5938 'SYMROOT': '<(DEPTH)/xcodebuild',
5930 }, 5939 },
5931 } 5940 }
OLDNEW
« 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