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

Side by Side Diff: build/common.gypi

Issue 163583004: Add GYP flag to optionally enable the Hangout Services extension in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing hack to copy to outer scope. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 'native_memory_pressure_signals%': 0, 502 'native_memory_pressure_signals%': 0,
503 503
504 'data_reduction_fallback_host%' : '', 504 'data_reduction_fallback_host%' : '',
505 'data_reduction_dev_host%' : '', 505 'data_reduction_dev_host%' : '',
506 'spdy_proxy_auth_origin%' : '', 506 'spdy_proxy_auth_origin%' : '',
507 'spdy_proxy_auth_property%' : '', 507 'spdy_proxy_auth_property%' : '',
508 'spdy_proxy_auth_value%' : '', 508 'spdy_proxy_auth_value%' : '',
509 'data_reduction_proxy_probe_url%' : '', 509 'data_reduction_proxy_probe_url%' : '',
510 'enable_mdns%' : 0, 510 'enable_mdns%' : 0,
511 'enable_enhanced_bookmarks%': 0, 511 'enable_enhanced_bookmarks%': 0,
512 'enable_hangout_services_extension%': 0,
512 513
513 'conditions': [ 514 'conditions': [
514 # A flag for POSIX platforms 515 # A flag for POSIX platforms
515 ['OS=="win"', { 516 ['OS=="win"', {
516 'os_posix%': 0, 517 'os_posix%': 0,
517 }, { 518 }, {
518 'os_posix%': 1, 519 'os_posix%': 1,
519 }], 520 }],
520 521
521 # A flag for BSD platforms 522 # A flag for BSD platforms
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 'native_discardable_memory%': '<(native_discardable_memory)', 970 'native_discardable_memory%': '<(native_discardable_memory)',
970 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 971 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
971 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)', 972 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
972 'data_reduction_dev_host%': '<(data_reduction_dev_host)', 973 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
973 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 974 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
974 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 975 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
975 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 976 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
976 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', 977 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
977 'enable_mdns%' : '<(enable_mdns)', 978 'enable_mdns%' : '<(enable_mdns)',
978 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)', 979 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
980 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
979 'v8_optimized_debug%': '<(v8_optimized_debug)', 981 'v8_optimized_debug%': '<(v8_optimized_debug)',
980 'proprietary_codecs%': '<(proprietary_codecs)', 982 'proprietary_codecs%': '<(proprietary_codecs)',
981 'use_goma%': '<(use_goma)', 983 'use_goma%': '<(use_goma)',
982 'gomadir%': '<(gomadir)', 984 'gomadir%': '<(gomadir)',
983 985
984 # Use system nspr instead of the bundled one. 986 # Use system nspr instead of the bundled one.
985 'use_system_nspr%': 0, 987 'use_system_nspr%': 0,
986 988
987 # Use system protobuf instead of bundled one. 989 # Use system protobuf instead of bundled one.
988 'use_system_protobuf%': 0, 990 'use_system_protobuf%': 0,
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 }], 1763 }],
1762 ['enable_webrtc==1', { 1764 ['enable_webrtc==1', {
1763 'grit_defines': ['-D', 'enable_webrtc'], 1765 'grit_defines': ['-D', 'enable_webrtc'],
1764 }], 1766 }],
1765 ['enable_mdns==1', { 1767 ['enable_mdns==1', {
1766 'grit_defines': ['-D', 'enable_mdns'], 1768 'grit_defines': ['-D', 'enable_mdns'],
1767 }], 1769 }],
1768 ['enable_enhanced_bookmarks==1', { 1770 ['enable_enhanced_bookmarks==1', {
1769 'grit_defines': ['-D', 'enable_enhanced_bookmarks'], 1771 'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
1770 }], 1772 }],
1773 ['enable_hangout_services_extension==1', {
1774 'grit_defines': ['-D', 'enable_hangout_services_extension'],
1775 }],
1771 ['enable_task_manager==1', { 1776 ['enable_task_manager==1', {
1772 'grit_defines': ['-D', 'enable_task_manager'], 1777 'grit_defines': ['-D', 'enable_task_manager'],
1773 }], 1778 }],
1774 ['clang_use_chrome_plugins==1 and OS!="win"', { 1779 ['clang_use_chrome_plugins==1 and OS!="win"', {
1775 'clang_chrome_plugins_flags': [ 1780 'clang_chrome_plugins_flags': [
1776 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1781 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1777 ], 1782 ],
1778 }], 1783 }],
1779 1784
1780 ['asan==1 and OS!="win"', { 1785 ['asan==1 and OS!="win"', {
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
2450 ['data_reduction_proxy_probe_url != ""', { 2455 ['data_reduction_proxy_probe_url != ""', {
2451 'defines': [ 2456 'defines': [
2452 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], 2457 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2453 }], 2458 }],
2454 ['enable_mdns==1', { 2459 ['enable_mdns==1', {
2455 'defines': ['ENABLE_MDNS=1'], 2460 'defines': ['ENABLE_MDNS=1'],
2456 }], 2461 }],
2457 ['enable_enhanced_bookmarks==1', { 2462 ['enable_enhanced_bookmarks==1', {
2458 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'], 2463 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'],
2459 }], 2464 }],
2465 ['enable_hangout_services_extension==1', {
2466 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
2467 }],
2460 ['enable_ipc_fuzzer==1', { 2468 ['enable_ipc_fuzzer==1', {
2461 'defines': ['ENABLE_IPC_FUZZER=1'], 2469 'defines': ['ENABLE_IPC_FUZZER=1'],
2462 }], 2470 }],
2463 ], # conditions for 'target_defaults' 2471 ], # conditions for 'target_defaults'
2464 'target_conditions': [ 2472 'target_conditions': [
2465 ['enable_wexit_time_destructors==1', { 2473 ['enable_wexit_time_destructors==1', {
2466 'conditions': [ 2474 'conditions': [
2467 [ 'clang==1', { 2475 [ 'clang==1', {
2468 'cflags': [ 2476 'cflags': [
2469 '-Wexit-time-destructors', 2477 '-Wexit-time-destructors',
(...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after
4911 # settings in target dicts. SYMROOT is a special case, because many other 4919 # settings in target dicts. SYMROOT is a special case, because many other
4912 # Xcode variables depend on it, including variables such as 4920 # Xcode variables depend on it, including variables such as
4913 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4921 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4914 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4922 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4915 # files to appear (when present) in the UI as actual files and not red 4923 # files to appear (when present) in the UI as actual files and not red
4916 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4924 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4917 # and therefore SYMROOT, needs to be set at the project level. 4925 # and therefore SYMROOT, needs to be set at the project level.
4918 'SYMROOT': '<(DEPTH)/xcodebuild', 4926 'SYMROOT': '<(DEPTH)/xcodebuild',
4919 }, 4927 },
4920 } 4928 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698