Chromium Code Reviews| 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 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 605 | 605 |
| 606 # Enables used resource whitelist generation; disabled by default. | 606 # Enables used resource whitelist generation; disabled by default. |
| 607 'enable_resource_whitelist_generation%': 0, | 607 'enable_resource_whitelist_generation%': 0, |
| 608 | 608 |
| 609 # Enable FILE support by default. | 609 # Enable FILE support by default. |
| 610 'disable_file_support%': 0, | 610 'disable_file_support%': 0, |
| 611 | 611 |
| 612 # Enable FTP support by default. | 612 # Enable FTP support by default. |
| 613 'disable_ftp_support%': 0, | 613 'disable_ftp_support%': 0, |
| 614 | 614 |
| 615 # Do not use the platform ICU alternatives by default. | |
| 616 'use_platform_icu_alternatives%': 0, | |
| 617 | |
| 618 # Do not disable brotli filter by default. | |
| 619 'disable_brotli_filter%': 0, | |
| 620 | |
| 615 # Use of precompiled headers on Windows. | 621 # Use of precompiled headers on Windows. |
| 616 # | 622 # |
| 617 # This variable may be explicitly set to 1 (enabled) or 0 | 623 # This variable may be explicitly set to 1 (enabled) or 0 |
| 618 # (disabled) in ~/.gyp/include.gypi or via the GYP command line. | 624 # (disabled) in ~/.gyp/include.gypi or via the GYP command line. |
| 619 # This setting will override the default. | 625 # This setting will override the default. |
| 620 # | 626 # |
| 621 # See | 627 # See |
| 622 # https://chromium.googlesource.com/chromium/src/+/master/docs/windows_pre compiled_headers.md | 628 # https://chromium.googlesource.com/chromium/src/+/master/docs/windows_pre compiled_headers.md |
| 623 # for details. | 629 # for details. |
| 624 'chromium_win_pch%': 0, | 630 'chromium_win_pch%': 0, |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1262 'test_isolation_mode%': '<(test_isolation_mode)', | 1268 'test_isolation_mode%': '<(test_isolation_mode)', |
| 1263 'enable_basic_printing%': '<(enable_basic_printing)', | 1269 'enable_basic_printing%': '<(enable_basic_printing)', |
| 1264 'enable_print_preview%': '<(enable_print_preview)', | 1270 'enable_print_preview%': '<(enable_print_preview)', |
| 1265 'enable_spellcheck%': '<(enable_spellcheck)', | 1271 'enable_spellcheck%': '<(enable_spellcheck)', |
| 1266 'use_browser_spellchecker%': '<(use_browser_spellchecker)', | 1272 'use_browser_spellchecker%': '<(use_browser_spellchecker)', |
| 1267 'cld_version%': '<(cld_version)', | 1273 'cld_version%': '<(cld_version)', |
| 1268 'cld2_table_size%': '<(cld2_table_size)', | 1274 'cld2_table_size%': '<(cld2_table_size)', |
| 1269 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', | 1275 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |
| 1270 'disable_file_support%': '<(disable_file_support)', | 1276 'disable_file_support%': '<(disable_file_support)', |
| 1271 'disable_ftp_support%': '<(disable_ftp_support)', | 1277 'disable_ftp_support%': '<(disable_ftp_support)', |
| 1278 'use_platform_icu_alternatives%': '<(use_platform_icu_alternatives)', | |
| 1279 'disable_brotli_filter%': '<(disable_brotli_filter)', | |
| 1272 'enable_task_manager%': '<(enable_task_manager)', | 1280 'enable_task_manager%': '<(enable_task_manager)', |
| 1273 'sas_dll_path%': '<(sas_dll_path)', | 1281 'sas_dll_path%': '<(sas_dll_path)', |
| 1274 'wix_path%': '<(wix_path)', | 1282 'wix_path%': '<(wix_path)', |
| 1275 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', | 1283 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', |
| 1276 'use_system_libjpeg%': '<(use_system_libjpeg)', | 1284 'use_system_libjpeg%': '<(use_system_libjpeg)', |
| 1277 'android_channel%': '<(android_channel)', | 1285 'android_channel%': '<(android_channel)', |
| 1278 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)', | 1286 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)', |
| 1279 'gyp_managed_install%': 0, | 1287 'gyp_managed_install%': 0, |
| 1280 'create_standalone_apk%': 1, | 1288 'create_standalone_apk%': 1, |
| 1281 'enable_app_list%': '<(enable_app_list)', | 1289 'enable_app_list%': '<(enable_app_list)', |
| (...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3018 }], | 3026 }], |
| 3019 ['enable_settings_app==1', { | 3027 ['enable_settings_app==1', { |
| 3020 'defines': ['ENABLE_SETTINGS_APP=1'], | 3028 'defines': ['ENABLE_SETTINGS_APP=1'], |
| 3021 }], | 3029 }], |
| 3022 ['disable_file_support==1', { | 3030 ['disable_file_support==1', { |
| 3023 'defines': ['DISABLE_FILE_SUPPORT=1'], | 3031 'defines': ['DISABLE_FILE_SUPPORT=1'], |
| 3024 }], | 3032 }], |
| 3025 ['disable_ftp_support==1', { | 3033 ['disable_ftp_support==1', { |
| 3026 'defines': ['DISABLE_FTP_SUPPORT=1'], | 3034 'defines': ['DISABLE_FTP_SUPPORT=1'], |
| 3027 }], | 3035 }], |
| 3036 ['use_platform_icu_alternatives==1', { | |
| 3037 'defines': ['USE_PLATFORM_ICU_ALTERNATIVES=1'], | |
|
brettw
2016/04/04 22:54:11
Instead of this and the place(s) you set this defi
kapishnikov
2016/04/05 15:22:04
That is nice. I will work on it.
kapishnikov
2016/04/05 22:10:15
Done. Changed to buildflag headers. The failure on
| |
| 3038 }], | |
| 3028 ['enable_supervised_users==1', { | 3039 ['enable_supervised_users==1', { |
| 3029 'defines': ['ENABLE_SUPERVISED_USERS=1'], | 3040 'defines': ['ENABLE_SUPERVISED_USERS=1'], |
| 3030 }], | 3041 }], |
| 3031 ['enable_mdns==1', { | 3042 ['enable_mdns==1', { |
| 3032 'defines': ['ENABLE_MDNS=1'], | 3043 'defines': ['ENABLE_MDNS=1'], |
| 3033 }], | 3044 }], |
| 3034 ['enable_service_discovery==1', { | 3045 ['enable_service_discovery==1', { |
| 3035 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ], | 3046 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ], |
| 3036 }], | 3047 }], |
| 3037 ['enable_hangout_services_extension==1', { | 3048 ['enable_hangout_services_extension==1', { |
| (...skipping 3334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6372 # settings in target dicts. SYMROOT is a special case, because many other | 6383 # settings in target dicts. SYMROOT is a special case, because many other |
| 6373 # Xcode variables depend on it, including variables such as | 6384 # Xcode variables depend on it, including variables such as |
| 6374 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6385 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6375 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6386 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6376 # files to appear (when present) in the UI as actual files and not red | 6387 # files to appear (when present) in the UI as actual files and not red |
| 6377 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6388 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6378 # and therefore SYMROOT, needs to be set at the project level. | 6389 # and therefore SYMROOT, needs to be set at the project level. |
| 6379 'SYMROOT': '<(DEPTH)/xcodebuild', | 6390 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6380 }, | 6391 }, |
| 6381 } | 6392 } |
| OLD | NEW |