| 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 # Set to 1 to make a build that logs like an official build, but is not | 259 # Set to 1 to make a build that logs like an official build, but is not |
| 260 # necessarily an official build, ie DCHECK and DLOG are disabled and | 260 # necessarily an official build, ie DCHECK and DLOG are disabled and |
| 261 # removed completely in release builds, to minimize binary footprint. | 261 # removed completely in release builds, to minimize binary footprint. |
| 262 # Note: this setting is ignored if buildtype=="Official". | 262 # Note: this setting is ignored if buildtype=="Official". |
| 263 'logging_like_official_build%': 0, | 263 'logging_like_official_build%': 0, |
| 264 | 264 |
| 265 # Set to 1 to make a build that disables unshipped tracing events. | 265 # Set to 1 to make a build that disables unshipped tracing events. |
| 266 # Note: this setting is ignored if buildtype=="Official". | 266 # Note: this setting is ignored if buildtype=="Official". |
| 267 'tracing_like_official_build%': 0, | 267 'tracing_like_official_build%': 0, |
| 268 | 268 |
| 269 # Disable file manager component extension by default. | |
| 270 'file_manager_extension%': 0, | |
| 271 | |
| 272 # Disable image loader component extension by default. | 269 # Disable image loader component extension by default. |
| 273 'image_loader_extension%': 0, | 270 'image_loader_extension%': 0, |
| 274 | 271 |
| 275 # Python version. | 272 # Python version. |
| 276 'python_ver%': '2.6', | 273 'python_ver%': '2.6', |
| 277 | 274 |
| 278 # Set NEON compilation flags. | 275 # Set NEON compilation flags. |
| 279 'arm_neon%': 1, | 276 'arm_neon%': 1, |
| 280 | 277 |
| 281 # Detect NEON support at run-time. | 278 # Detect NEON support at run-time. |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 'use_gnome_keyring%': 0, | 581 'use_gnome_keyring%': 0, |
| 585 }, { | 582 }, { |
| 586 'use_gnome_keyring%': 1, | 583 'use_gnome_keyring%': 1, |
| 587 }], | 584 }], |
| 588 | 585 |
| 589 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { | 586 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { |
| 590 # GTK+, Mac and iOS want Title Case strings | 587 # GTK+, Mac and iOS want Title Case strings |
| 591 'use_titlecase_in_grd_files%': 1, | 588 'use_titlecase_in_grd_files%': 1, |
| 592 }], | 589 }], |
| 593 | 590 |
| 594 # Enable file manager and image loader extensions on Chrome OS. | 591 # Enable loader extensions on Chrome OS. |
| 595 ['chromeos==1', { | 592 ['chromeos==1', { |
| 596 'file_manager_extension%': 1, | |
| 597 'image_loader_extension%': 1, | 593 'image_loader_extension%': 1, |
| 598 }, { | 594 }, { |
| 599 'file_manager_extension%': 0, | |
| 600 'image_loader_extension%': 0, | 595 'image_loader_extension%': 0, |
| 601 }], | 596 }], |
| 602 | 597 |
| 603 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { | 598 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { |
| 604 'enable_one_click_signin%': 1, | 599 'enable_one_click_signin%': 1, |
| 605 }], | 600 }], |
| 606 | 601 |
| 607 ['OS=="android"', { | 602 ['OS=="android"', { |
| 608 'enable_automation%': 0, | 603 'enable_automation%': 0, |
| 609 'enable_extensions%': 0, | 604 'enable_extensions%': 0, |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 889 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 884 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 890 'desktop_linux%': '<(desktop_linux)', | 885 'desktop_linux%': '<(desktop_linux)', |
| 891 'use_x11%': '<(use_x11)', | 886 'use_x11%': '<(use_x11)', |
| 892 'use_gnome_keyring%': '<(use_gnome_keyring)', | 887 'use_gnome_keyring%': '<(use_gnome_keyring)', |
| 893 'linux_fpic%': '<(linux_fpic)', | 888 'linux_fpic%': '<(linux_fpic)', |
| 894 'chromeos%': '<(chromeos)', | 889 'chromeos%': '<(chromeos)', |
| 895 'enable_viewport%': '<(enable_viewport)', | 890 'enable_viewport%': '<(enable_viewport)', |
| 896 'enable_hidpi%': '<(enable_hidpi)', | 891 'enable_hidpi%': '<(enable_hidpi)', |
| 897 'enable_touch_ui%': '<(enable_touch_ui)', | 892 'enable_touch_ui%': '<(enable_touch_ui)', |
| 898 'use_xi2_mt%':'<(use_xi2_mt)', | 893 'use_xi2_mt%':'<(use_xi2_mt)', |
| 899 'file_manager_extension%': '<(file_manager_extension)', | |
| 900 'image_loader_extension%': '<(image_loader_extension)', | 894 'image_loader_extension%': '<(image_loader_extension)', |
| 901 'fastbuild%': '<(fastbuild)', | 895 'fastbuild%': '<(fastbuild)', |
| 902 'dcheck_always_on%': '<(dcheck_always_on)', | 896 'dcheck_always_on%': '<(dcheck_always_on)', |
| 903 'logging_like_official_build%': '<(logging_like_official_build)', | 897 'logging_like_official_build%': '<(logging_like_official_build)', |
| 904 'tracing_like_official_build%': '<(tracing_like_official_build)', | 898 'tracing_like_official_build%': '<(tracing_like_official_build)', |
| 905 'python_ver%': '<(python_ver)', | 899 'python_ver%': '<(python_ver)', |
| 906 'arm_version%': '<(arm_version)', | 900 'arm_version%': '<(arm_version)', |
| 907 'arm_neon%': '<(arm_neon)', | 901 'arm_neon%': '<(arm_neon)', |
| 908 'arm_neon_optional%': '<(arm_neon_optional)', | 902 'arm_neon_optional%': '<(arm_neon_optional)', |
| 909 'sysroot%': '<(sysroot)', | 903 'sysroot%': '<(sysroot)', |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 }], | 1669 }], |
| 1676 ['use_ash==1', { | 1670 ['use_ash==1', { |
| 1677 'grit_defines': ['-D', 'use_ash'], | 1671 'grit_defines': ['-D', 'use_ash'], |
| 1678 }], | 1672 }], |
| 1679 ['use_nss==1', { | 1673 ['use_nss==1', { |
| 1680 'grit_defines': ['-D', 'use_nss'], | 1674 'grit_defines': ['-D', 'use_nss'], |
| 1681 }], | 1675 }], |
| 1682 ['use_ozone==1', { | 1676 ['use_ozone==1', { |
| 1683 'grit_defines': ['-D', 'use_ozone'], | 1677 'grit_defines': ['-D', 'use_ozone'], |
| 1684 }], | 1678 }], |
| 1685 ['file_manager_extension==1', { | |
| 1686 'grit_defines': ['-D', 'file_manager_extension'], | |
| 1687 }], | |
| 1688 ['image_loader_extension==1', { | 1679 ['image_loader_extension==1', { |
| 1689 'grit_defines': ['-D', 'image_loader_extension'], | 1680 'grit_defines': ['-D', 'image_loader_extension'], |
| 1690 }], | 1681 }], |
| 1691 ['remoting==1', { | 1682 ['remoting==1', { |
| 1692 'grit_defines': ['-D', 'remoting'], | 1683 'grit_defines': ['-D', 'remoting'], |
| 1693 }], | 1684 }], |
| 1694 ['use_titlecase_in_grd_files==1', { | 1685 ['use_titlecase_in_grd_files==1', { |
| 1695 'grit_defines': ['-D', 'use_titlecase'], | 1686 'grit_defines': ['-D', 'use_titlecase'], |
| 1696 }], | 1687 }], |
| 1697 ['OS=="android" and target_arch=="ia32"', { | 1688 ['OS=="android" and target_arch=="ia32"', { |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2160 # TODO(erg): We are progressively sealing up use of deprecated features | 2151 # TODO(erg): We are progressively sealing up use of deprecated features |
| 2161 # in gtk in preparation for an eventual porting to gtk3. | 2152 # in gtk in preparation for an eventual porting to gtk3. |
| 2162 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], | 2153 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], |
| 2163 }], | 2154 }], |
| 2164 ['chromeos==1', { | 2155 ['chromeos==1', { |
| 2165 'defines': ['OS_CHROMEOS=1'], | 2156 'defines': ['OS_CHROMEOS=1'], |
| 2166 }], | 2157 }], |
| 2167 ['use_xi2_mt!=0 and use_x11==1', { | 2158 ['use_xi2_mt!=0 and use_x11==1', { |
| 2168 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], | 2159 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], |
| 2169 }], | 2160 }], |
| 2170 ['file_manager_extension==1', { | |
| 2171 'defines': ['FILE_MANAGER_EXTENSION=1'], | |
| 2172 }], | |
| 2173 ['image_loader_extension==1', { | 2161 ['image_loader_extension==1', { |
| 2174 'defines': ['IMAGE_LOADER_EXTENSION=1'], | 2162 'defines': ['IMAGE_LOADER_EXTENSION=1'], |
| 2175 }], | 2163 }], |
| 2176 ['profiling==1', { | 2164 ['profiling==1', { |
| 2177 'defines': ['ENABLE_PROFILING=1'], | 2165 'defines': ['ENABLE_PROFILING=1'], |
| 2178 }], | 2166 }], |
| 2179 ['remoting==1', { | 2167 ['remoting==1', { |
| 2180 'defines': ['ENABLE_REMOTING=1'], | 2168 'defines': ['ENABLE_REMOTING=1'], |
| 2181 }], | 2169 }], |
| 2182 ['enable_webrtc==1', { | 2170 ['enable_webrtc==1', { |
| (...skipping 2644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4827 # settings in target dicts. SYMROOT is a special case, because many other | 4815 # settings in target dicts. SYMROOT is a special case, because many other |
| 4828 # Xcode variables depend on it, including variables such as | 4816 # Xcode variables depend on it, including variables such as |
| 4829 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4817 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4830 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4818 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4831 # files to appear (when present) in the UI as actual files and not red | 4819 # files to appear (when present) in the UI as actual files and not red |
| 4832 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4820 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4833 # and therefore SYMROOT, needs to be set at the project level. | 4821 # and therefore SYMROOT, needs to be set at the project level. |
| 4834 'SYMROOT': '<(DEPTH)/xcodebuild', | 4822 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4835 }, | 4823 }, |
| 4836 } | 4824 } |
| OLD | NEW |