| 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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 'test_isolation_outdir%': '', | 599 'test_isolation_outdir%': '', |
| 600 | 600 |
| 601 'wix_path%': '<(DEPTH)/third_party/wix', | 601 'wix_path%': '<(DEPTH)/third_party/wix', |
| 602 | 602 |
| 603 # Supervised users are enabled by default. | 603 # Supervised users are enabled by default. |
| 604 'enable_supervised_users%': 1, | 604 'enable_supervised_users%': 1, |
| 605 | 605 |
| 606 # Platform sends memory pressure signals natively. | 606 # Platform sends memory pressure signals natively. |
| 607 'native_memory_pressure_signals%': 0, | 607 'native_memory_pressure_signals%': 0, |
| 608 | 608 |
| 609 # Platform supports shrinking of discardable shared memory segments. |
| 610 'discardable_shared_memory_shrinking%': 0, |
| 611 |
| 609 'spdy_proxy_auth_property%' : '', | 612 'spdy_proxy_auth_property%' : '', |
| 610 'spdy_proxy_auth_value%' : '', | 613 'spdy_proxy_auth_value%' : '', |
| 611 'enable_mdns%' : 0, | 614 'enable_mdns%' : 0, |
| 612 'enable_service_discovery%': 0, | 615 'enable_service_discovery%': 0, |
| 613 'enable_wifi_bootstrapping%': 0, | 616 'enable_wifi_bootstrapping%': 0, |
| 614 'enable_hangout_services_extension%': 0, | 617 'enable_hangout_services_extension%': 0, |
| 615 | 618 |
| 616 # Enable the Syzygy optimization step. | 619 # Enable the Syzygy optimization step. |
| 617 'syzygy_optimize%': 0, | 620 'syzygy_optimize%': 0, |
| 618 | 621 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 770 ['OS=="android" or branding=="Chrome" or chromecast==1', { | 773 ['OS=="android" or branding=="Chrome" or chromecast==1', { |
| 771 'proprietary_codecs%': 1, | 774 'proprietary_codecs%': 1, |
| 772 }, { | 775 }, { |
| 773 'proprietary_codecs%': 0, | 776 'proprietary_codecs%': 0, |
| 774 }], | 777 }], |
| 775 | 778 |
| 776 ['OS=="mac" or OS=="ios"', { | 779 ['OS=="mac" or OS=="ios"', { |
| 777 'native_memory_pressure_signals%': 1, | 780 'native_memory_pressure_signals%': 1, |
| 778 }], | 781 }], |
| 779 | 782 |
| 783 ['OS!="win" and OS!="android"', { |
| 784 'discardable_shared_memory_shrinking%': 1, |
| 785 }], |
| 786 |
| 780 # Enable autofill dialog for Android, Mac and Views-enabled platforms. | 787 # Enable autofill dialog for Android, Mac and Views-enabled platforms. |
| 781 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS
=="mac"', { | 788 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS
=="mac"', { |
| 782 'enable_autofill_dialog%': 1, | 789 'enable_autofill_dialog%': 1, |
| 783 | 790 |
| 784 'conditions': [ | 791 'conditions': [ |
| 785 ['buildtype=="Official"', { | 792 ['buildtype=="Official"', { |
| 786 'enable_prod_wallet_service%': 1, | 793 'enable_prod_wallet_service%': 1, |
| 787 }], | 794 }], |
| 788 ] | 795 ] |
| 789 }], | 796 }], |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1191 'gyp_managed_install%': 0, | 1198 'gyp_managed_install%': 0, |
| 1192 'create_standalone_apk%': 1, | 1199 'create_standalone_apk%': 1, |
| 1193 'enable_app_list%': '<(enable_app_list)', | 1200 'enable_app_list%': '<(enable_app_list)', |
| 1194 'use_default_render_theme%': '<(use_default_render_theme)', | 1201 'use_default_render_theme%': '<(use_default_render_theme)', |
| 1195 'enable_settings_app%': '<(enable_settings_app)', | 1202 'enable_settings_app%': '<(enable_settings_app)', |
| 1196 'google_api_key%': '<(google_api_key)', | 1203 'google_api_key%': '<(google_api_key)', |
| 1197 'google_default_client_id%': '<(google_default_client_id)', | 1204 'google_default_client_id%': '<(google_default_client_id)', |
| 1198 'google_default_client_secret%': '<(google_default_client_secret)', | 1205 'google_default_client_secret%': '<(google_default_client_secret)', |
| 1199 'enable_supervised_users%': '<(enable_supervised_users)', | 1206 'enable_supervised_users%': '<(enable_supervised_users)', |
| 1200 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', | 1207 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', |
| 1208 'discardable_shared_memory_shrinking%': '<(discardable_shared_memory_shrinki
ng)', |
| 1201 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', | 1209 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', |
| 1202 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', | 1210 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', |
| 1203 'enable_mdns%' : '<(enable_mdns)', | 1211 'enable_mdns%' : '<(enable_mdns)', |
| 1204 'enable_service_discovery%' : '<(enable_service_discovery)', | 1212 'enable_service_discovery%' : '<(enable_service_discovery)', |
| 1205 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', | 1213 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', |
| 1206 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)
', | 1214 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension)
', |
| 1207 'v8_optimized_debug%': '<(v8_optimized_debug)', | 1215 'v8_optimized_debug%': '<(v8_optimized_debug)', |
| 1208 'proprietary_codecs%': '<(proprietary_codecs)', | 1216 'proprietary_codecs%': '<(proprietary_codecs)', |
| 1209 'use_goma%': '<(use_goma)', | 1217 'use_goma%': '<(use_goma)', |
| 1210 'gomadir%': '<(gomadir)', | 1218 'gomadir%': '<(gomadir)', |
| (...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2708 }], | 2716 }], |
| 2709 ['notifications==1', { | 2717 ['notifications==1', { |
| 2710 'defines': ['ENABLE_NOTIFICATIONS'], | 2718 'defines': ['ENABLE_NOTIFICATIONS'], |
| 2711 }], | 2719 }], |
| 2712 ['enable_hidpi==1', { | 2720 ['enable_hidpi==1', { |
| 2713 'defines': ['ENABLE_HIDPI=1'], | 2721 'defines': ['ENABLE_HIDPI=1'], |
| 2714 }], | 2722 }], |
| 2715 ['native_memory_pressure_signals==1', { | 2723 ['native_memory_pressure_signals==1', { |
| 2716 'defines': ['SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE'], | 2724 'defines': ['SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE'], |
| 2717 }], | 2725 }], |
| 2726 ['discardable_shared_memory_shrinking==1', { |
| 2727 'defines': ['DISCARDABLE_SHARED_MEMORY_SHRINKING'], |
| 2728 }], |
| 2718 ['use_udev==1', { | 2729 ['use_udev==1', { |
| 2719 'defines': ['USE_UDEV'], | 2730 'defines': ['USE_UDEV'], |
| 2720 }], | 2731 }], |
| 2721 ['fastbuild!=0', { | 2732 ['fastbuild!=0', { |
| 2722 'xcode_settings': { | 2733 'xcode_settings': { |
| 2723 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO', | 2734 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO', |
| 2724 }, | 2735 }, |
| 2725 'conditions': [ | 2736 'conditions': [ |
| 2726 ['OS=="win" and fastbuild==2', { | 2737 ['OS=="win" and fastbuild==2', { |
| 2727 # Completely disable debug information. | 2738 # Completely disable debug information. |
| (...skipping 3295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6023 # settings in target dicts. SYMROOT is a special case, because many other | 6034 # settings in target dicts. SYMROOT is a special case, because many other |
| 6024 # Xcode variables depend on it, including variables such as | 6035 # Xcode variables depend on it, including variables such as |
| 6025 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6036 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6026 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6037 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6027 # files to appear (when present) in the UI as actual files and not red | 6038 # files to appear (when present) in the UI as actual files and not red |
| 6028 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6039 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6029 # and therefore SYMROOT, needs to be set at the project level. | 6040 # and therefore SYMROOT, needs to be set at the project level. |
| 6030 'SYMROOT': '<(DEPTH)/xcodebuild', | 6041 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6031 }, | 6042 }, |
| 6032 } | 6043 } |
| OLD | NEW |