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

Side by Side 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 unified diff | Download patch
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 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 # Platform sends memory pressure signals natively. 508 # Platform sends memory pressure signals natively.
509 'native_memory_pressure_signals%': 0, 509 'native_memory_pressure_signals%': 0,
510 510
511 'data_reduction_fallback_host%' : '', 511 'data_reduction_fallback_host%' : '',
512 'data_reduction_dev_host%' : '', 512 'data_reduction_dev_host%' : '',
513 'spdy_proxy_auth_origin%' : '', 513 'spdy_proxy_auth_origin%' : '',
514 'spdy_proxy_auth_property%' : '', 514 'spdy_proxy_auth_property%' : '',
515 'spdy_proxy_auth_value%' : '', 515 'spdy_proxy_auth_value%' : '',
516 'data_reduction_proxy_probe_url%' : '', 516 'data_reduction_proxy_probe_url%' : '',
517 'enable_mdns%' : 0, 517 'enable_mdns%' : 0,
518 'enable_service_discovery%': 0,
518 'enable_enhanced_bookmarks%': 0, 519 'enable_enhanced_bookmarks%': 0,
519 'enable_hangout_services_extension%': 0, 520 'enable_hangout_services_extension%': 0,
520 521
521 'conditions': [ 522 'conditions': [
522 # A flag for POSIX platforms 523 # A flag for POSIX platforms
523 ['OS=="win"', { 524 ['OS=="win"', {
524 'os_posix%': 0, 525 'os_posix%': 0,
525 }, { 526 }, {
526 'os_posix%': 1, 527 'os_posix%': 1,
527 }], 528 }],
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 'enable_managed_users%': '<(enable_managed_users)', 988 'enable_managed_users%': '<(enable_managed_users)',
988 'native_discardable_memory%': '<(native_discardable_memory)', 989 'native_discardable_memory%': '<(native_discardable_memory)',
989 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 990 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
990 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)', 991 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
991 'data_reduction_dev_host%': '<(data_reduction_dev_host)', 992 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
992 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 993 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
993 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 994 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
994 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 995 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
995 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', 996 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
996 'enable_mdns%' : '<(enable_mdns)', 997 'enable_mdns%' : '<(enable_mdns)',
998 'enable_service_discovery%' : '<(enable_service_discovery)',
997 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)', 999 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
998 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ', 1000 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
999 'v8_optimized_debug%': '<(v8_optimized_debug)', 1001 'v8_optimized_debug%': '<(v8_optimized_debug)',
1000 'proprietary_codecs%': '<(proprietary_codecs)', 1002 'proprietary_codecs%': '<(proprietary_codecs)',
1001 'use_goma%': '<(use_goma)', 1003 'use_goma%': '<(use_goma)',
1002 'gomadir%': '<(gomadir)', 1004 'gomadir%': '<(gomadir)',
1003 1005
1004 # Use system protobuf instead of bundled one. 1006 # Use system protobuf instead of bundled one.
1005 'use_system_protobuf%': 0, 1007 'use_system_protobuf%': 0,
1006 1008
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 }], 1792 }],
1791 ['enable_google_now==1', { 1793 ['enable_google_now==1', {
1792 'grit_defines': ['-D', 'enable_google_now'], 1794 'grit_defines': ['-D', 'enable_google_now'],
1793 }], 1795 }],
1794 ['use_concatenated_impulse_responses==1', { 1796 ['use_concatenated_impulse_responses==1', {
1795 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], 1797 'grit_defines': ['-D', 'use_concatenated_impulse_responses'],
1796 }], 1798 }],
1797 ['enable_webrtc==1', { 1799 ['enable_webrtc==1', {
1798 'grit_defines': ['-D', 'enable_webrtc'], 1800 'grit_defines': ['-D', 'enable_webrtc'],
1799 }], 1801 }],
1800 ['enable_mdns==1', {
1801 'grit_defines': ['-D', 'enable_mdns'],
1802 }],
1803 ['enable_enhanced_bookmarks==1', { 1802 ['enable_enhanced_bookmarks==1', {
1804 'grit_defines': ['-D', 'enable_enhanced_bookmarks'], 1803 'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
1805 }], 1804 }],
1806 ['enable_hangout_services_extension==1', { 1805 ['enable_hangout_services_extension==1', {
1807 'grit_defines': ['-D', 'enable_hangout_services_extension'], 1806 'grit_defines': ['-D', 'enable_hangout_services_extension'],
1808 }], 1807 }],
1809 ['enable_task_manager==1', { 1808 ['enable_task_manager==1', {
1810 'grit_defines': ['-D', 'enable_task_manager'], 1809 'grit_defines': ['-D', 'enable_task_manager'],
1811 }], 1810 }],
1812 ['notifications==1', { 1811 ['notifications==1', {
1813 'grit_defines': ['-D', 'enable_notifications'], 1812 'grit_defines': ['-D', 'enable_notifications'],
1814 }], 1813 }],
1815 ['enable_resource_whitelist_generation==1', { 1814 ['enable_resource_whitelist_generation==1', {
1816 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("{textual_ id}") {numeric_id}'], 1815 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("{textual_ id}") {numeric_id}'],
1817 }], 1816 }],
1817 ['enable_mdns==1 or OS=="mac"', {
1818 'grit_defines': ['-D', 'enable_service_discovery'],
1819 'enable_service_discovery%': 1
1820 }],
1818 ['clang_use_chrome_plugins==1 and OS!="win"', { 1821 ['clang_use_chrome_plugins==1 and OS!="win"', {
1819 'clang_chrome_plugins_flags': [ 1822 'clang_chrome_plugins_flags': [
1820 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1823 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1821 ], 1824 ],
1822 }], 1825 }],
1823 1826
1824 ['asan==1', { 1827 ['asan==1', {
1825 'clang%': 1, 1828 'clang%': 1,
1826 }], 1829 }],
1827 ['asan==1 and OS=="mac"', { 1830 ['asan==1 and OS=="mac"', {
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
2485 ['spdy_proxy_auth_value != ""', { 2488 ['spdy_proxy_auth_value != ""', {
2486 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2489 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2487 }], 2490 }],
2488 ['data_reduction_proxy_probe_url != ""', { 2491 ['data_reduction_proxy_probe_url != ""', {
2489 'defines': [ 2492 'defines': [
2490 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], 2493 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2491 }], 2494 }],
2492 ['enable_mdns==1', { 2495 ['enable_mdns==1', {
2493 'defines': ['ENABLE_MDNS=1'], 2496 'defines': ['ENABLE_MDNS=1'],
2494 }], 2497 }],
2498 ['enable_service_discovery==1', {
2499 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
2500 }],
2495 ['enable_enhanced_bookmarks==1', { 2501 ['enable_enhanced_bookmarks==1', {
2496 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'], 2502 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'],
2497 }], 2503 }],
2498 ['enable_hangout_services_extension==1', { 2504 ['enable_hangout_services_extension==1', {
2499 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'], 2505 'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
2500 }], 2506 }],
2501 ['enable_ipc_fuzzer==1', { 2507 ['enable_ipc_fuzzer==1', {
2502 'defines': ['ENABLE_IPC_FUZZER=1'], 2508 'defines': ['ENABLE_IPC_FUZZER=1'],
2503 }], 2509 }],
2504 ['video_hole==1', { 2510 ['video_hole==1', {
(...skipping 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after
5042 # settings in target dicts. SYMROOT is a special case, because many other 5048 # settings in target dicts. SYMROOT is a special case, because many other
5043 # Xcode variables depend on it, including variables such as 5049 # Xcode variables depend on it, including variables such as
5044 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5050 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5045 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5051 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5046 # files to appear (when present) in the UI as actual files and not red 5052 # files to appear (when present) in the UI as actual files and not red
5047 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5053 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5048 # and therefore SYMROOT, needs to be set at the project level. 5054 # and therefore SYMROOT, needs to be set at the project level.
5049 'SYMROOT': '<(DEPTH)/xcodebuild', 5055 'SYMROOT': '<(DEPTH)/xcodebuild',
5050 }, 5056 },
5051 } 5057 }
OLDNEW
« 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