| 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   566       # See third_party/cld_2/cld_2.gyp for more information. |   566       # See third_party/cld_2/cld_2.gyp for more information. | 
|   567       #   0: Small tables, lower accuracy |   567       #   0: Small tables, lower accuracy | 
|   568       #   2: Large tables, high accuracy |   568       #   2: Large tables, high accuracy | 
|   569       'cld2_table_size%': 2, |   569       'cld2_table_size%': 2, | 
|   570  |   570  | 
|   571       # Enable spell checker. |   571       # Enable spell checker. | 
|   572       'enable_spellcheck%': 1, |   572       'enable_spellcheck%': 1, | 
|   573  |   573  | 
|   574       # Use the operating system spellchecker, e.g. NSSpellChecker on Mac or |   574       # Use the operating system spellchecker, e.g. NSSpellChecker on Mac or | 
|   575       # SpellCheckerSession on Android. |   575       # SpellCheckerSession on Android. | 
|   576       'use_platform_spellchecker%': 0, |   576       'use_browser_spellchecker%': 0, | 
|   577  |   577  | 
|   578       # Webrtc compilation is enabled by default. Set to 0 to disable. |   578       # Webrtc compilation is enabled by default. Set to 0 to disable. | 
|   579       'enable_webrtc%': 1, |   579       'enable_webrtc%': 1, | 
|   580  |   580  | 
|   581       # Media router support is enabled by default. Set to 0 to disable. |   581       # Media router support is enabled by default. Set to 0 to disable. | 
|   582       'enable_media_router%': 1, |   582       'enable_media_router%': 1, | 
|   583  |   583  | 
|   584       # Enables use of the session service, which is enabled by default. |   584       # Enables use of the session service, which is enabled by default. | 
|   585       # Support for disabling depends on the platform. |   585       # Support for disabling depends on the platform. | 
|   586       'enable_session_service%': 1, |   586       'enable_session_service%': 1, | 
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   822           'arm_neon_optional%': 1, |   822           'arm_neon_optional%': 1, | 
|   823           'native_memory_pressure_signals%': 1, |   823           'native_memory_pressure_signals%': 1, | 
|   824           'enable_basic_printing%': 1, |   824           'enable_basic_printing%': 1, | 
|   825           'enable_print_preview%': 0, |   825           'enable_print_preview%': 0, | 
|   826           'enable_task_manager%':0, |   826           'enable_task_manager%':0, | 
|   827           'video_hole%': 1, |   827           'video_hole%': 1, | 
|   828         }], |   828         }], | 
|   829  |   829  | 
|   830         # Android and OSX have built-in spellcheckers that can be utilized. |   830         # Android and OSX have built-in spellcheckers that can be utilized. | 
|   831         ['OS=="android" or OS=="mac"', { |   831         ['OS=="android" or OS=="mac"', { | 
|   832           'use_platform_spellchecker%': 1, |   832           'use_browser_spellchecker%': 1, | 
|   833         }], |   833         }], | 
|   834  |   834  | 
|   835         # Android OS includes support for proprietary codecs regardless of |   835         # Android OS includes support for proprietary codecs regardless of | 
|   836         # building Chromium or Google Chrome. We also ship Google Chrome and |   836         # building Chromium or Google Chrome. We also ship Google Chrome and | 
|   837         # Chromecast with proprietary codecs. |   837         # Chromecast with proprietary codecs. | 
|   838         ['OS=="android" or branding=="Chrome" or chromecast==1', { |   838         ['OS=="android" or branding=="Chrome" or chromecast==1', { | 
|   839           'proprietary_codecs%': 1, |   839           'proprietary_codecs%': 1, | 
|   840         }, { |   840         }, { | 
|   841           'proprietary_codecs%': 0, |   841           'proprietary_codecs%': 0, | 
|   842         }], |   842         }], | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1204     'enable_background%': '<(enable_background)', |  1204     'enable_background%': '<(enable_background)', | 
|  1205     'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', |  1205     'linux_use_bundled_gold%': '<(linux_use_bundled_gold)', | 
|  1206     'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)', |  1206     'linux_use_bundled_binutils%': '<(linux_use_bundled_binutils)', | 
|  1207     'linux_use_gold_flags%': '<(linux_use_gold_flags)', |  1207     'linux_use_gold_flags%': '<(linux_use_gold_flags)', | 
|  1208     'linux_use_debug_fission%': '<(linux_use_debug_fission)', |  1208     'linux_use_debug_fission%': '<(linux_use_debug_fission)', | 
|  1209     'use_canvas_skia%': '<(use_canvas_skia)', |  1209     'use_canvas_skia%': '<(use_canvas_skia)', | 
|  1210     'test_isolation_mode%': '<(test_isolation_mode)', |  1210     'test_isolation_mode%': '<(test_isolation_mode)', | 
|  1211     'enable_basic_printing%': '<(enable_basic_printing)', |  1211     'enable_basic_printing%': '<(enable_basic_printing)', | 
|  1212     'enable_print_preview%': '<(enable_print_preview)', |  1212     'enable_print_preview%': '<(enable_print_preview)', | 
|  1213     'enable_spellcheck%': '<(enable_spellcheck)', |  1213     'enable_spellcheck%': '<(enable_spellcheck)', | 
|  1214     'use_platform_spellchecker%': '<(use_platform_spellchecker)', |  1214     'use_browser_spellchecker%': '<(use_browser_spellchecker)', | 
|  1215     'enable_google_now%': '<(enable_google_now)', |  1215     'enable_google_now%': '<(enable_google_now)', | 
|  1216     'cld_version%': '<(cld_version)', |  1216     'cld_version%': '<(cld_version)', | 
|  1217     'cld2_table_size%': '<(cld2_table_size)', |  1217     'cld2_table_size%': '<(cld2_table_size)', | 
|  1218     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |  1218     'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', | 
|  1219     'disable_file_support%': '<(disable_file_support)', |  1219     'disable_file_support%': '<(disable_file_support)', | 
|  1220     'disable_ftp_support%': '<(disable_ftp_support)', |  1220     'disable_ftp_support%': '<(disable_ftp_support)', | 
|  1221     'use_icu_alternatives_on_android%': '<(use_icu_alternatives_on_android)', |  1221     'use_icu_alternatives_on_android%': '<(use_icu_alternatives_on_android)', | 
|  1222     'enable_task_manager%': '<(enable_task_manager)', |  1222     'enable_task_manager%': '<(enable_task_manager)', | 
|  1223     'sas_dll_path%': '<(sas_dll_path)', |  1223     'sas_dll_path%': '<(sas_dll_path)', | 
|  1224     'wix_path%': '<(wix_path)', |  1224     'wix_path%': '<(wix_path)', | 
| (...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3003         'defines': ['ENABLE_BASIC_PRINTING=1'], |  3003         'defines': ['ENABLE_BASIC_PRINTING=1'], | 
|  3004       }], |  3004       }], | 
|  3005       ['enable_print_preview==1', { |  3005       ['enable_print_preview==1', { | 
|  3006         # Enable printing with print preview. |  3006         # Enable printing with print preview. | 
|  3007         # Can be defined without ENABLE_BASIC_PRINTING. |  3007         # Can be defined without ENABLE_BASIC_PRINTING. | 
|  3008         'defines': ['ENABLE_PRINT_PREVIEW=1'], |  3008         'defines': ['ENABLE_PRINT_PREVIEW=1'], | 
|  3009       }], |  3009       }], | 
|  3010       ['enable_spellcheck==1', { |  3010       ['enable_spellcheck==1', { | 
|  3011         'defines': ['ENABLE_SPELLCHECK=1'], |  3011         'defines': ['ENABLE_SPELLCHECK=1'], | 
|  3012       }], |  3012       }], | 
|  3013       ['use_platform_spellchecker', { |  3013       ['use_browser_spellchecker', { | 
|  3014         'defines': ['USE_PLATFORM_SPELLCHECKER=1'], |  3014         'defines': ['USE_BROWSER_SPELLCHECKER=1'], | 
|  3015       }], |  3015       }], | 
|  3016       ['enable_captive_portal_detection==1', { |  3016       ['enable_captive_portal_detection==1', { | 
|  3017         'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], |  3017         'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], | 
|  3018       }], |  3018       }], | 
|  3019       ['enable_app_list==1', { |  3019       ['enable_app_list==1', { | 
|  3020         'defines': ['ENABLE_APP_LIST=1'], |  3020         'defines': ['ENABLE_APP_LIST=1'], | 
|  3021       }], |  3021       }], | 
|  3022       ['enable_settings_app==1', { |  3022       ['enable_settings_app==1', { | 
|  3023         'defines': ['ENABLE_SETTINGS_APP=1'], |  3023         'defines': ['ENABLE_SETTINGS_APP=1'], | 
|  3024       }], |  3024       }], | 
| (...skipping 3266 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  6291     # settings in target dicts.  SYMROOT is a special case, because many other |  6291     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  6292     # Xcode variables depend on it, including variables such as |  6292     # Xcode variables depend on it, including variables such as | 
|  6293     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  6293     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  6294     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  6294     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  6295     # files to appear (when present) in the UI as actual files and not red |  6295     # files to appear (when present) in the UI as actual files and not red | 
|  6296     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  6296     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  6297     # and therefore SYMROOT, needs to be set at the project level. |  6297     # and therefore SYMROOT, needs to be set at the project level. | 
|  6298     'SYMROOT': '<(DEPTH)/xcodebuild', |  6298     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  6299   }, |  6299   }, | 
|  6300 } |  6300 } | 
| OLD | NEW |