OLD | NEW |
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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 # Platform natively supports discardable memory. | 436 # Platform natively supports discardable memory. |
437 'native_discardable_memory%': 0, | 437 'native_discardable_memory%': 0, |
438 | 438 |
439 # Platform sends memory pressure signals natively. | 439 # Platform sends memory pressure signals natively. |
440 'native_memory_pressure_signals%': 0, | 440 'native_memory_pressure_signals%': 0, |
441 | 441 |
442 'spdy_proxy_auth_origin%' : '', | 442 'spdy_proxy_auth_origin%' : '', |
443 'spdy_proxy_auth_property%' : '', | 443 'spdy_proxy_auth_property%' : '', |
444 'spdy_proxy_auth_value%' : '', | 444 'spdy_proxy_auth_value%' : '', |
445 'enable_mdns%' : 0, | 445 'enable_mdns%' : 0, |
| 446 'enable_enhanced_bookmarks%': 0, |
446 | 447 |
447 'conditions': [ | 448 'conditions': [ |
448 # A flag for POSIX platforms | 449 # A flag for POSIX platforms |
449 ['OS=="win"', { | 450 ['OS=="win"', { |
450 'os_posix%': 0, | 451 'os_posix%': 0, |
451 }, { | 452 }, { |
452 'os_posix%': 1, | 453 'os_posix%': 1, |
453 }], | 454 }], |
454 | 455 |
455 # A flag for BSD platforms | 456 # A flag for BSD platforms |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 'google_api_key%': '<(google_api_key)', | 887 'google_api_key%': '<(google_api_key)', |
887 'google_default_client_id%': '<(google_default_client_id)', | 888 'google_default_client_id%': '<(google_default_client_id)', |
888 'google_default_client_secret%': '<(google_default_client_secret)', | 889 'google_default_client_secret%': '<(google_default_client_secret)', |
889 'enable_managed_users%': '<(enable_managed_users)', | 890 'enable_managed_users%': '<(enable_managed_users)', |
890 'native_discardable_memory%': '<(native_discardable_memory)', | 891 'native_discardable_memory%': '<(native_discardable_memory)', |
891 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', | 892 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', |
892 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', | 893 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', |
893 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', | 894 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', |
894 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', | 895 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', |
895 'enable_mdns%' : '<(enable_mdns)', | 896 'enable_mdns%' : '<(enable_mdns)', |
| 897 'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)', |
896 'v8_optimized_debug': '<(v8_optimized_debug)', | 898 'v8_optimized_debug': '<(v8_optimized_debug)', |
897 'proprietary_codecs%': '<(proprietary_codecs)', | 899 'proprietary_codecs%': '<(proprietary_codecs)', |
898 | 900 |
899 # Use system nspr instead of the bundled one. | 901 # Use system nspr instead of the bundled one. |
900 'use_system_nspr%': 0, | 902 'use_system_nspr%': 0, |
901 | 903 |
902 # Use system protobuf instead of bundled one. | 904 # Use system protobuf instead of bundled one. |
903 'use_system_protobuf%': 0, | 905 'use_system_protobuf%': 0, |
904 | 906 |
905 # Use system yasm instead of bundled one. | 907 # Use system yasm instead of bundled one. |
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1640 }], | 1642 }], |
1641 ['use_concatenated_impulse_responses==1', { | 1643 ['use_concatenated_impulse_responses==1', { |
1642 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], | 1644 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], |
1643 }], | 1645 }], |
1644 ['enable_webrtc==1', { | 1646 ['enable_webrtc==1', { |
1645 'grit_defines': ['-D', 'enable_webrtc'], | 1647 'grit_defines': ['-D', 'enable_webrtc'], |
1646 }], | 1648 }], |
1647 ['enable_mdns==1', { | 1649 ['enable_mdns==1', { |
1648 'grit_defines': ['-D', 'enable_mdns'], | 1650 'grit_defines': ['-D', 'enable_mdns'], |
1649 }], | 1651 }], |
| 1652 ['enable_enhanced_bookmarks==1', { |
| 1653 'grit_defines': ['-D', 'enable_enhanced_bookmarks'], |
| 1654 }], |
1650 ['clang_use_chrome_plugins==1 and OS!="win"', { | 1655 ['clang_use_chrome_plugins==1 and OS!="win"', { |
1651 'clang_chrome_plugins_flags': [ | 1656 'clang_chrome_plugins_flags': [ |
1652 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 1657 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
1653 ], | 1658 ], |
1654 }], | 1659 }], |
1655 | 1660 |
1656 ['asan==1 and OS!="win"', { | 1661 ['asan==1 and OS!="win"', { |
1657 'clang%': 1, | 1662 'clang%': 1, |
1658 }], | 1663 }], |
1659 ['asan==1 and OS=="mac"', { | 1664 ['asan==1 and OS=="mac"', { |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2330 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], | 2335 'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'], |
2331 }], | 2336 }], |
2332 ['spdy_proxy_auth_property != ""', { | 2337 ['spdy_proxy_auth_property != ""', { |
2333 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], | 2338 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], |
2334 }], | 2339 }], |
2335 ['spdy_proxy_auth_value != ""', { | 2340 ['spdy_proxy_auth_value != ""', { |
2336 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], | 2341 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], |
2337 }], | 2342 }], |
2338 ['enable_mdns==1', { | 2343 ['enable_mdns==1', { |
2339 'defines': ['ENABLE_MDNS=1'], | 2344 'defines': ['ENABLE_MDNS=1'], |
| 2345 }], |
| 2346 ['enable_enhanced_bookmarks==1', { |
| 2347 'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'], |
2340 }] | 2348 }] |
2341 ], # conditions for 'target_defaults' | 2349 ], # conditions for 'target_defaults' |
2342 'target_conditions': [ | 2350 'target_conditions': [ |
2343 ['enable_wexit_time_destructors==1', { | 2351 ['enable_wexit_time_destructors==1', { |
2344 'conditions': [ | 2352 'conditions': [ |
2345 [ 'clang==1', { | 2353 [ 'clang==1', { |
2346 'cflags': [ | 2354 'cflags': [ |
2347 '-Wexit-time-destructors', | 2355 '-Wexit-time-destructors', |
2348 ], | 2356 ], |
2349 'xcode_settings': { | 2357 'xcode_settings': { |
(...skipping 2390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4740 # settings in target dicts. SYMROOT is a special case, because many other | 4748 # settings in target dicts. SYMROOT is a special case, because many other |
4741 # Xcode variables depend on it, including variables such as | 4749 # Xcode variables depend on it, including variables such as |
4742 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4743 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4744 # files to appear (when present) in the UI as actual files and not red | 4752 # files to appear (when present) in the UI as actual files and not red |
4745 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4746 # and therefore SYMROOT, needs to be set at the project level. | 4754 # and therefore SYMROOT, needs to be set at the project level. |
4747 'SYMROOT': '<(DEPTH)/xcodebuild', | 4755 'SYMROOT': '<(DEPTH)/xcodebuild', |
4748 }, | 4756 }, |
4749 } | 4757 } |
OLD | NEW |