| 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 330 | 330 | 
| 331       # Use system libjpeg. Note that the system's libjepg will be used even if | 331       # Use system libjpeg. Note that the system's libjepg will be used even if | 
| 332       # use_libjpeg_turbo is set. | 332       # use_libjpeg_turbo is set. | 
| 333       'use_system_libjpeg%': 0, | 333       'use_system_libjpeg%': 0, | 
| 334 | 334 | 
| 335       # By default, component is set to static_library and it can be overriden | 335       # By default, component is set to static_library and it can be overriden | 
| 336       # by the GYP command line or by ~/.gyp/include.gypi. | 336       # by the GYP command line or by ~/.gyp/include.gypi. | 
| 337       'component%': 'static_library', | 337       'component%': 'static_library', | 
| 338 | 338 | 
| 339       # Set to select the Title Case versions of strings in GRD files. | 339       # Set to select the Title Case versions of strings in GRD files. | 
| 340       'use_titlecase_in_grd_files%': 0, | 340       'use_titlecase_in_grd%': 0, | 
| 341 | 341 | 
| 342       # Use translations provided by volunteers at launchpad.net.  This | 342       # Use translations provided by volunteers at launchpad.net.  This | 
| 343       # currently only works on Linux. | 343       # currently only works on Linux. | 
| 344       'use_third_party_translations%': 0, | 344       'use_third_party_translations%': 0, | 
| 345 | 345 | 
| 346       # Remoting compilation is enabled by default. Set to 0 to disable. | 346       # Remoting compilation is enabled by default. Set to 0 to disable. | 
| 347       'remoting%': 1, | 347       'remoting%': 1, | 
| 348 | 348 | 
| 349       # Configuration policy is enabled by default. Set to 0 to disable. | 349       # Configuration policy is enabled by default. Set to 0 to disable. | 
| 350       'configuration_policy%': 1, | 350       'configuration_policy%': 1, | 
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 707         # support will be available. This option is useful | 707         # support will be available. This option is useful | 
| 708         # for Linux distributions and for Aura. | 708         # for Linux distributions and for Aura. | 
| 709         ['OS!="linux" or chromeos==1', { | 709         ['OS!="linux" or chromeos==1', { | 
| 710           'use_gnome_keyring%': 0, | 710           'use_gnome_keyring%': 0, | 
| 711         }, { | 711         }, { | 
| 712           'use_gnome_keyring%': 1, | 712           'use_gnome_keyring%': 1, | 
| 713         }], | 713         }], | 
| 714 | 714 | 
| 715         ['OS=="mac" or OS=="ios"', { | 715         ['OS=="mac" or OS=="ios"', { | 
| 716           # Mac and iOS want Title Case strings | 716           # Mac and iOS want Title Case strings | 
| 717           'use_titlecase_in_grd_files%': 1, | 717           'use_titlecase_in_grd%': 1, | 
| 718         }], | 718         }], | 
| 719 | 719 | 
| 720         # Enable loader extensions on Chrome OS. | 720         # Enable loader extensions on Chrome OS. | 
| 721         ['chromeos==1', { | 721         ['chromeos==1', { | 
| 722           'image_loader_extension%': 1, | 722           'image_loader_extension%': 1, | 
| 723         }, { | 723         }, { | 
| 724           'image_loader_extension%': 0, | 724           'image_loader_extension%': 0, | 
| 725         }], | 725         }], | 
| 726 | 726 | 
| 727         ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { | 727         ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1089     'dcheck_always_on%': '<(dcheck_always_on)', | 1089     'dcheck_always_on%': '<(dcheck_always_on)', | 
| 1090     'tracing_like_official_build%': '<(tracing_like_official_build)', | 1090     'tracing_like_official_build%': '<(tracing_like_official_build)', | 
| 1091     'arm_version%': '<(arm_version)', | 1091     'arm_version%': '<(arm_version)', | 
| 1092     'arm_neon%': '<(arm_neon)', | 1092     'arm_neon%': '<(arm_neon)', | 
| 1093     'arm_neon_optional%': '<(arm_neon_optional)', | 1093     'arm_neon_optional%': '<(arm_neon_optional)', | 
| 1094     'sysroot%': '<(sysroot)', | 1094     'sysroot%': '<(sysroot)', | 
| 1095     'chroot_cmd%': '<(chroot_cmd)', | 1095     'chroot_cmd%': '<(chroot_cmd)', | 
| 1096     'system_libdir%': '<(system_libdir)', | 1096     'system_libdir%': '<(system_libdir)', | 
| 1097     'component%': '<(component)', | 1097     'component%': '<(component)', | 
| 1098     'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera
      tion)', | 1098     'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera
      tion)', | 
| 1099     'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', | 1099     'use_titlecase_in_grd%': '<(use_titlecase_in_grd)', | 
| 1100     'use_third_party_translations%': '<(use_third_party_translations)', | 1100     'use_third_party_translations%': '<(use_third_party_translations)', | 
| 1101     'remoting%': '<(remoting)', | 1101     'remoting%': '<(remoting)', | 
| 1102     'enable_one_click_signin%': '<(enable_one_click_signin)', | 1102     'enable_one_click_signin%': '<(enable_one_click_signin)', | 
| 1103     'enable_pre_sync_backup%': '<(enable_pre_sync_backup)', | 1103     'enable_pre_sync_backup%': '<(enable_pre_sync_backup)', | 
| 1104     'enable_webrtc%': '<(enable_webrtc)', | 1104     'enable_webrtc%': '<(enable_webrtc)', | 
| 1105     'chromium_win_pch%': '<(chromium_win_pch)', | 1105     'chromium_win_pch%': '<(chromium_win_pch)', | 
| 1106     'configuration_policy%': '<(configuration_policy)', | 1106     'configuration_policy%': '<(configuration_policy)', | 
| 1107     'safe_browsing%': '<(safe_browsing)', | 1107     'safe_browsing%': '<(safe_browsing)', | 
| 1108     'enable_web_speech%': '<(enable_web_speech)', | 1108     'enable_web_speech%': '<(enable_web_speech)', | 
| 1109     'notifications%': '<(notifications)', | 1109     'notifications%': '<(notifications)', | 
| (...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2019       }], | 2019       }], | 
| 2020       ['use_ozone==1', { | 2020       ['use_ozone==1', { | 
| 2021         'grit_defines': ['-D', 'use_ozone'], | 2021         'grit_defines': ['-D', 'use_ozone'], | 
| 2022       }], | 2022       }], | 
| 2023       ['image_loader_extension==1', { | 2023       ['image_loader_extension==1', { | 
| 2024         'grit_defines': ['-D', 'image_loader_extension'], | 2024         'grit_defines': ['-D', 'image_loader_extension'], | 
| 2025       }], | 2025       }], | 
| 2026       ['remoting==1', { | 2026       ['remoting==1', { | 
| 2027         'grit_defines': ['-D', 'remoting'], | 2027         'grit_defines': ['-D', 'remoting'], | 
| 2028       }], | 2028       }], | 
| 2029       ['use_titlecase_in_grd_files==1', { | 2029       ['use_titlecase_in_grd==1', { | 
| 2030         'grit_defines': ['-D', 'use_titlecase'], | 2030         'grit_defines': ['-D', 'use_titlecase'], | 
| 2031       }], | 2031       }], | 
| 2032       ['use_third_party_translations==1', { | 2032       ['use_third_party_translations==1', { | 
| 2033         'grit_defines': ['-D', 'use_third_party_translations'], | 2033         'grit_defines': ['-D', 'use_third_party_translations'], | 
| 2034         'locales': [ | 2034         'locales': [ | 
| 2035           'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', | 2035           'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', | 
| 2036           'ka', 'ku', 'kw', 'ms', 'ug' | 2036           'ka', 'ku', 'kw', 'ms', 'ug' | 
| 2037         ], | 2037         ], | 
| 2038       }], | 2038       }], | 
| 2039       ['OS=="android"', { | 2039       ['OS=="android"', { | 
| (...skipping 3722 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5762     # settings in target dicts.  SYMROOT is a special case, because many other | 5762     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5763     # Xcode variables depend on it, including variables such as | 5763     # Xcode variables depend on it, including variables such as | 
| 5764     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5764     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5765     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5765     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5766     # files to appear (when present) in the UI as actual files and not red | 5766     # files to appear (when present) in the UI as actual files and not red | 
| 5767     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5767     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5768     # and therefore SYMROOT, needs to be set at the project level. | 5768     # and therefore SYMROOT, needs to be set at the project level. | 
| 5769     'SYMROOT': '<(DEPTH)/xcodebuild', | 5769     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5770   }, | 5770   }, | 
| 5771 } | 5771 } | 
| OLD | NEW | 
|---|