| 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. |
| 11 'variables': { | 11 'variables': { |
| 12 # Putting a variables dict inside another variables dict looks kind of | 12 # Putting a variables dict inside another variables dict looks kind of |
| 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as | 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as |
| 14 # variables within the outer variables dict here. This is necessary | 14 # variables within the outer variables dict here. This is necessary |
| 15 # to get these variables defined for the conditions within this variables | 15 # to get these variables defined for the conditions within this variables |
| 16 # dict that operate on these variables. | 16 # dict that operate on these variables. |
| 17 'variables': { | 17 'variables': { |
| 18 'variables': { | 18 'variables': { |
| 19 'variables': { | 19 'variables': { |
| 20 'variables': { | 20 'variables': { |
| 21 # Whether we're building a ChromeOS build. | 21 # Whether we're building a ChromeOS build. |
| 22 'chromeos%': 0, | 22 'chromeos%': 0, |
| 23 | 23 |
| 24 # Whether or not we are using the Aura windowing framework. | 24 # Whether or not we are using the Aura windowing framework. |
| 25 'use_aura%': 0, | 25 'use_aura%': 0, |
| 26 | 26 |
| 27 # Whether or not we are building the Ash shell. | 27 # Whether or not we are building the Ash shell. |
| 28 'use_ash%': 0, | 28 'use_ash%': 0, |
| 29 'asan_sentinel%': 0, |
| 29 }, | 30 }, |
| 30 # Copy conditionally-set variables out one scope. | 31 # Copy conditionally-set variables out one scope. |
| 31 'chromeos%': '<(chromeos)', | 32 'chromeos%': '<(chromeos)', |
| 32 'use_aura%': '<(use_aura)', | 33 'use_aura%': '<(use_aura)', |
| 33 'use_ash%': '<(use_ash)', | 34 'use_ash%': '<(use_ash)', |
| 34 | 35 |
| 36 'asan_sentinel%': '<(asan_sentinel)', |
| 37 |
| 35 # Whether we are using Views Toolkit | 38 # Whether we are using Views Toolkit |
| 36 'toolkit_views%': 0, | 39 'toolkit_views%': 0, |
| 37 | 40 |
| 38 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/
62803 | 41 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/
62803 |
| 39 'use_openssl%': 0, | 42 'use_openssl%': 0, |
| 40 | 43 |
| 41 # Disable viewport meta tag by default. | 44 # Disable viewport meta tag by default. |
| 42 'enable_viewport%': 0, | 45 'enable_viewport%': 0, |
| 43 | 46 |
| 44 # Enable HiDPI support. | 47 # Enable HiDPI support. |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 # Copy conditionally-set variables out one scope. | 93 # Copy conditionally-set variables out one scope. |
| 91 'chromeos%': '<(chromeos)', | 94 'chromeos%': '<(chromeos)', |
| 92 'use_aura%': '<(use_aura)', | 95 'use_aura%': '<(use_aura)', |
| 93 'use_ash%': '<(use_ash)', | 96 'use_ash%': '<(use_ash)', |
| 94 'use_openssl%': '<(use_openssl)', | 97 'use_openssl%': '<(use_openssl)', |
| 95 'enable_viewport%': '<(enable_viewport)', | 98 'enable_viewport%': '<(enable_viewport)', |
| 96 'enable_hidpi%': '<(enable_hidpi)', | 99 'enable_hidpi%': '<(enable_hidpi)', |
| 97 'enable_touch_ui%': '<(enable_touch_ui)', | 100 'enable_touch_ui%': '<(enable_touch_ui)', |
| 98 'buildtype%': '<(buildtype)', | 101 'buildtype%': '<(buildtype)', |
| 99 'host_arch%': '<(host_arch)', | 102 'host_arch%': '<(host_arch)', |
| 103 'asan_sentinel%': '<(asan_sentinel)', |
| 100 | 104 |
| 101 # Default architecture we're building for is the architecture we're | 105 # Default architecture we're building for is the architecture we're |
| 102 # building on. | 106 # building on. |
| 103 'target_arch%': '<(host_arch)', | 107 'target_arch%': '<(host_arch)', |
| 104 | 108 |
| 105 # Sets whether we're building with the Android SDK/NDK (and hence with | 109 # Sets whether we're building with the Android SDK/NDK (and hence with |
| 106 # Ant, value 0), or as part of the Android system (and hence with the | 110 # Ant, value 0), or as part of the Android system (and hence with the |
| 107 # Android build system, value 1). | 111 # Android build system, value 1). |
| 108 'android_build_type%': 0, | 112 'android_build_type%': 0, |
| 109 | 113 |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 # require server-side APIs may fail to work if no keys are | 659 # require server-side APIs may fail to work if no keys are |
| 656 # provided. | 660 # provided. |
| 657 # | 661 # |
| 658 # Note that if you are building an official build or if | 662 # Note that if you are building an official build or if |
| 659 # use_official_google_api_keys has been set to 1 (explicitly or | 663 # use_official_google_api_keys has been set to 1 (explicitly or |
| 660 # implicitly), these values will be ignored and the official | 664 # implicitly), these values will be ignored and the official |
| 661 # keys will be used instead. | 665 # keys will be used instead. |
| 662 'google_api_key%': '', | 666 'google_api_key%': '', |
| 663 'google_default_client_id%': '', | 667 'google_default_client_id%': '', |
| 664 'google_default_client_secret%': '', | 668 'google_default_client_secret%': '', |
| 669 'asan_sentinel%': '<(asan_sentinel)', |
| 665 }, | 670 }, |
| 666 | 671 |
| 667 # Copy conditionally-set variables out one scope. | 672 # Copy conditionally-set variables out one scope. |
| 668 'branding%': '<(branding)', | 673 'branding%': '<(branding)', |
| 669 'buildtype%': '<(buildtype)', | 674 'buildtype%': '<(buildtype)', |
| 670 'target_arch%': '<(target_arch)', | 675 'target_arch%': '<(target_arch)', |
| 671 'host_arch%': '<(host_arch)', | 676 'host_arch%': '<(host_arch)', |
| 672 'library%': 'static_library', | 677 'library%': 'static_library', |
| 673 'toolkit_views%': '<(toolkit_views)', | 678 'toolkit_views%': '<(toolkit_views)', |
| 674 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', | 679 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 'enable_app_list%': '<(enable_app_list)', | 753 'enable_app_list%': '<(enable_app_list)', |
| 749 'enable_message_center%': '<(enable_message_center)', | 754 'enable_message_center%': '<(enable_message_center)', |
| 750 'use_default_render_theme%': '<(use_default_render_theme)', | 755 'use_default_render_theme%': '<(use_default_render_theme)', |
| 751 'enable_web_intents%': '<(enable_web_intents)', | 756 'enable_web_intents%': '<(enable_web_intents)', |
| 752 'enable_settings_app%': '<(enable_settings_app)', | 757 'enable_settings_app%': '<(enable_settings_app)', |
| 753 'use_official_google_api_keys%': '<(use_official_google_api_keys)', | 758 'use_official_google_api_keys%': '<(use_official_google_api_keys)', |
| 754 'google_api_key%': '<(google_api_key)', | 759 'google_api_key%': '<(google_api_key)', |
| 755 'google_default_client_id%': '<(google_default_client_id)', | 760 'google_default_client_id%': '<(google_default_client_id)', |
| 756 'google_default_client_secret%': '<(google_default_client_secret)', | 761 'google_default_client_secret%': '<(google_default_client_secret)', |
| 757 'enable_managed_users%': '<(enable_managed_users)', | 762 'enable_managed_users%': '<(enable_managed_users)', |
| 763 'asan_sentinel%': '<(asan_sentinel)', |
| 758 | 764 |
| 759 # Use system mesa instead of bundled one. | 765 # Use system mesa instead of bundled one. |
| 760 'use_system_mesa%': 0, | 766 'use_system_mesa%': 0, |
| 761 | 767 |
| 762 # Use system nspr instead of the bundled one. | 768 # Use system nspr instead of the bundled one. |
| 763 'use_system_nspr%': 0, | 769 'use_system_nspr%': 0, |
| 764 | 770 |
| 765 # Use system protobuf instead of bundled one. | 771 # Use system protobuf instead of bundled one. |
| 766 'use_system_protobuf%': 0, | 772 'use_system_protobuf%': 0, |
| 767 | 773 |
| (...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1614 # same warnings as we do for clang. | 1620 # same warnings as we do for clang. |
| 1615 # TODO(sbc): Remove these if/when they are removed from the clang | 1621 # TODO(sbc): Remove these if/when they are removed from the clang |
| 1616 # build. | 1622 # build. |
| 1617 '-Wno-unused-function', | 1623 '-Wno-unused-function', |
| 1618 '-Wno-char-subscripts', | 1624 '-Wno-char-subscripts', |
| 1619 '-Wno-c++11-extensions', | 1625 '-Wno-c++11-extensions', |
| 1620 '-Wno-unnamed-type-template-args', | 1626 '-Wno-unnamed-type-template-args', |
| 1621 ], | 1627 ], |
| 1622 | 1628 |
| 1623 'conditions': [ | 1629 'conditions': [ |
| 1630 |
| 1624 ['OS=="win" and component=="shared_library"', { | 1631 ['OS=="win" and component=="shared_library"', { |
| 1625 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx | 1632 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx |
| 1626 'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL) | 1633 'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL) |
| 1627 'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL) | 1634 'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL) |
| 1628 }, { | 1635 }, { |
| 1629 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx | 1636 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx |
| 1630 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) | 1637 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) |
| 1631 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) | 1638 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) |
| 1632 }], | 1639 }], |
| 1633 ['OS=="ios"', { | 1640 ['OS=="ios"', { |
| 1634 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l | 1641 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l |
| 1635 'mac_release_optimization%': 's', # Use -Os unless overridden | 1642 'mac_release_optimization%': 's', # Use -Os unless overridden |
| 1636 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 1643 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 1637 }, { | 1644 }, { |
| 1638 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l | 1645 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l |
| 1639 'mac_release_optimization%': '3', # Use -O3 unless overridden | 1646 'mac_release_optimization%': '3', # Use -O3 unless overridden |
| 1640 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 1647 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 1641 }], | 1648 }], |
| 1642 ], | 1649 ], |
| 1643 }, | 1650 }, |
| 1644 'conditions': [ | 1651 'conditions': [ |
| 1652 ['1==1 and asan_sentinel==0', { |
| 1653 'dependencies': [ |
| 1654 '<(DEPTH)/build/asan.gyp:asan_dynamic_runtime', |
| 1655 ], |
| 1656 }], |
| 1645 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { | 1657 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { |
| 1646 'cflags_cc!': ['-fno-rtti'], | 1658 'cflags_cc!': ['-fno-rtti'], |
| 1647 'cflags_cc+': [ | 1659 'cflags_cc+': [ |
| 1648 '-frtti', | 1660 '-frtti', |
| 1649 '-gline-tables-only', | 1661 '-gline-tables-only', |
| 1650 '-fintercept-allocation-functions', | 1662 '-fintercept-allocation-functions', |
| 1651 ], | 1663 ], |
| 1652 'defines': ['TYPE_PROFILING'], | 1664 'defines': ['TYPE_PROFILING'], |
| 1653 'dependencies': [ | 1665 'dependencies': [ |
| 1654 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', | 1666 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', |
| (...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2393 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], | 2405 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], |
| 2394 }, | 2406 }, |
| 2395 'Release_x64': { | 2407 'Release_x64': { |
| 2396 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], | 2408 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], |
| 2397 }, | 2409 }, |
| 2398 }], | 2410 }], |
| 2399 ], | 2411 ], |
| 2400 }, | 2412 }, |
| 2401 }, | 2413 }, |
| 2402 'conditions': [ | 2414 'conditions': [ |
| 2415 |
| 2403 ['os_posix==1', { | 2416 ['os_posix==1', { |
| 2404 'target_defaults': { | 2417 'target_defaults': { |
| 2405 'ldflags': [ | 2418 'ldflags': [ |
| 2406 '-Wl,-z,now', | 2419 '-Wl,-z,now', |
| 2407 '-Wl,-z,relro', | 2420 '-Wl,-z,relro', |
| 2408 ], | 2421 ], |
| 2409 }, | 2422 }, |
| 2410 }], | 2423 }], |
| 2411 ['os_posix==1 and chromeos==0', { | 2424 ['os_posix==1 and chromeos==0', { |
| 2412 # Chrome OS enables -fstack-protector-strong via its build wrapper, | 2425 # Chrome OS enables -fstack-protector-strong via its build wrapper, |
| (...skipping 1619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4032 # xcode_settings sections, or better yet, should use non-Xcode-specific | 4045 # xcode_settings sections, or better yet, should use non-Xcode-specific |
| 4033 # settings in target dicts. SYMROOT is a special case, because many other | 4046 # settings in target dicts. SYMROOT is a special case, because many other |
| 4034 # Xcode variables depend on it, including variables such as | 4047 # Xcode variables depend on it, including variables such as |
| 4035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4048 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4049 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4037 # files to appear (when present) in the UI as actual files and not red | 4050 # files to appear (when present) in the UI as actual files and not red |
| 4038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4051 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4039 # and therefore SYMROOT, needs to be set at the project level. | 4052 # and therefore SYMROOT, needs to be set at the project level. |
| 4040 'SYMROOT': '<(DEPTH)/xcodebuild', | 4053 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4041 }, | 4054 }, |
| 4055 |
| 4042 } | 4056 } |
| OLD | NEW |