Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: build/common.gypi

Issue 15962018: Fix ResourceLoadTiming Resolution Issue 4th step - remove unused macros from common.gypi (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 27 matching lines...) Expand all
38 38
39 # Whether we are using Views Toolkit 39 # Whether we are using Views Toolkit
40 'toolkit_views%': 0, 40 'toolkit_views%': 0,
41 41
42 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 42 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
43 'use_openssl%': 0, 43 'use_openssl%': 0,
44 44
45 # Disable viewport meta tag by default. 45 # Disable viewport meta tag by default.
46 'enable_viewport%': 0, 46 'enable_viewport%': 0,
47 47
48 # Enable DoubleResourceLoadTiming support.
49 'enable_double_resource_load_timing%': 1,
50
51 # Enable HiDPI support. 48 # Enable HiDPI support.
52 'enable_hidpi%': 0, 49 'enable_hidpi%': 0,
53 50
54 # Enable touch optimized art assets and metrics. 51 # Enable touch optimized art assets and metrics.
55 'enable_touch_ui%': 0, 52 'enable_touch_ui%': 0,
56 53
57 # Override buildtype to select the desired build flavor. 54 # Override buildtype to select the desired build flavor.
58 # Dev - everyday build for development/testing 55 # Dev - everyday build for development/testing
59 # Official - release build (generally implies additional processing) 56 # Official - release build (generally implies additional processing)
60 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 57 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 }], 94 }],
98 ], 95 ],
99 }, 96 },
100 # Copy conditionally-set variables out one scope. 97 # Copy conditionally-set variables out one scope.
101 'chromeos%': '<(chromeos)', 98 'chromeos%': '<(chromeos)',
102 'use_aura%': '<(use_aura)', 99 'use_aura%': '<(use_aura)',
103 'use_ash%': '<(use_ash)', 100 'use_ash%': '<(use_ash)',
104 'use_ozone%': '<(use_ozone)', 101 'use_ozone%': '<(use_ozone)',
105 'use_openssl%': '<(use_openssl)', 102 'use_openssl%': '<(use_openssl)',
106 'enable_viewport%': '<(enable_viewport)', 103 'enable_viewport%': '<(enable_viewport)',
107 'enable_double_resource_load_timing%': '<(enable_double_resource_load_ti ming)',
108 'enable_hidpi%': '<(enable_hidpi)', 104 'enable_hidpi%': '<(enable_hidpi)',
109 'enable_touch_ui%': '<(enable_touch_ui)', 105 'enable_touch_ui%': '<(enable_touch_ui)',
110 'buildtype%': '<(buildtype)', 106 'buildtype%': '<(buildtype)',
111 'branding%': '<(branding)', 107 'branding%': '<(branding)',
112 'host_arch%': '<(host_arch)', 108 'host_arch%': '<(host_arch)',
113 109
114 # Default architecture we're building for is the architecture we're 110 # Default architecture we're building for is the architecture we're
115 # building on. 111 # building on.
116 'target_arch%': '<(host_arch)', 112 'target_arch%': '<(host_arch)',
117 113
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 'chromeos%': '<(chromeos)', 175 'chromeos%': '<(chromeos)',
180 'host_arch%': '<(host_arch)', 176 'host_arch%': '<(host_arch)',
181 'target_arch%': '<(target_arch)', 177 'target_arch%': '<(target_arch)',
182 'toolkit_views%': '<(toolkit_views)', 178 'toolkit_views%': '<(toolkit_views)',
183 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 179 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
184 'use_aura%': '<(use_aura)', 180 'use_aura%': '<(use_aura)',
185 'use_ash%': '<(use_ash)', 181 'use_ash%': '<(use_ash)',
186 'use_ozone%': '<(use_ozone)', 182 'use_ozone%': '<(use_ozone)',
187 'use_openssl%': '<(use_openssl)', 183 'use_openssl%': '<(use_openssl)',
188 'enable_viewport%': '<(enable_viewport)', 184 'enable_viewport%': '<(enable_viewport)',
189 'enable_double_resource_load_timing%': '<(enable_double_resource_load_timi ng)',
190 'enable_hidpi%': '<(enable_hidpi)', 185 'enable_hidpi%': '<(enable_hidpi)',
191 'enable_touch_ui%': '<(enable_touch_ui)', 186 'enable_touch_ui%': '<(enable_touch_ui)',
192 'android_webview_build%': '<(android_webview_build)', 187 'android_webview_build%': '<(android_webview_build)',
193 'google_tv%': '<(google_tv)', 188 'google_tv%': '<(google_tv)',
194 'enable_app_list%': '<(enable_app_list)', 189 'enable_app_list%': '<(enable_app_list)',
195 'use_default_render_theme%': '<(use_default_render_theme)', 190 'use_default_render_theme%': '<(use_default_render_theme)',
196 'buildtype%': '<(buildtype)', 191 'buildtype%': '<(buildtype)',
197 'branding%': '<(branding)', 192 'branding%': '<(branding)',
198 'arm_version%': '<(arm_version)', 193 'arm_version%': '<(arm_version)',
199 'linux_lsb_release%': '<(linux_lsb_release)', 194 'linux_lsb_release%': '<(linux_lsb_release)',
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 'os_posix%': '<(os_posix)', 739 'os_posix%': '<(os_posix)',
745 'use_glib%': '<(use_glib)', 740 'use_glib%': '<(use_glib)',
746 'use_pango%': '<(use_pango)', 741 'use_pango%': '<(use_pango)',
747 'use_ozone%': '<(use_ozone)', 742 'use_ozone%': '<(use_ozone)',
748 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 743 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
749 'use_x11%': '<(use_x11)', 744 'use_x11%': '<(use_x11)',
750 'use_gnome_keyring%': '<(use_gnome_keyring)', 745 'use_gnome_keyring%': '<(use_gnome_keyring)',
751 'linux_fpic%': '<(linux_fpic)', 746 'linux_fpic%': '<(linux_fpic)',
752 'chromeos%': '<(chromeos)', 747 'chromeos%': '<(chromeos)',
753 'enable_viewport%': '<(enable_viewport)', 748 'enable_viewport%': '<(enable_viewport)',
754 'enable_double_resource_load_timing%': '<(enable_double_resource_load_timing )',
755 'enable_hidpi%': '<(enable_hidpi)', 749 'enable_hidpi%': '<(enable_hidpi)',
756 'enable_touch_ui%': '<(enable_touch_ui)', 750 'enable_touch_ui%': '<(enable_touch_ui)',
757 'use_xi2_mt%':'<(use_xi2_mt)', 751 'use_xi2_mt%':'<(use_xi2_mt)',
758 'file_manager_extension%': '<(file_manager_extension)', 752 'file_manager_extension%': '<(file_manager_extension)',
759 'image_loader_extension%': '<(image_loader_extension)', 753 'image_loader_extension%': '<(image_loader_extension)',
760 'fastbuild%': '<(fastbuild)', 754 'fastbuild%': '<(fastbuild)',
761 'dcheck_always_on%': '<(dcheck_always_on)', 755 'dcheck_always_on%': '<(dcheck_always_on)',
762 'python_ver%': '<(python_ver)', 756 'python_ver%': '<(python_ver)',
763 'arm_version%': '<(arm_version)', 757 'arm_version%': '<(arm_version)',
764 'armv7%': '<(armv7)', 758 'armv7%': '<(armv7)',
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1848 'xcode_settings': { 1842 'xcode_settings': {
1849 'DYLIB_INSTALL_NAME_BASE': '@rpath', 1843 'DYLIB_INSTALL_NAME_BASE': '@rpath',
1850 'LD_RUNPATH_SEARCH_PATHS': [ 1844 'LD_RUNPATH_SEARCH_PATHS': [
1851 # For unbundled binaries. 1845 # For unbundled binaries.
1852 '@loader_path/.', 1846 '@loader_path/.',
1853 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 1847 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
1854 '@loader_path/../../..', 1848 '@loader_path/../../..',
1855 ], 1849 ],
1856 }, 1850 },
1857 }], 1851 }],
1858 ['enable_double_resource_load_timing==1', {
1859 'defines': ['ENABLE_DOUBLE_RESOURCE_LOAD_TIMING'],
1860 }],
1861 ['enable_rlz==1', { 1852 ['enable_rlz==1', {
1862 'defines': ['ENABLE_RLZ'], 1853 'defines': ['ENABLE_RLZ'],
1863 }], 1854 }],
1864 ['component=="shared_library"', { 1855 ['component=="shared_library"', {
1865 'defines': ['COMPONENT_BUILD'], 1856 'defines': ['COMPONENT_BUILD'],
1866 }], 1857 }],
1867 ['toolkit_views==1', { 1858 ['toolkit_views==1', {
1868 'defines': ['TOOLKIT_VIEWS=1'], 1859 'defines': ['TOOLKIT_VIEWS=1'],
1869 }], 1860 }],
1870 ['ui_compositor_image_transport==1', { 1861 ['ui_compositor_image_transport==1', {
(...skipping 2648 matching lines...) Expand 10 before | Expand all | Expand 10 after
4519 # settings in target dicts. SYMROOT is a special case, because many other 4510 # settings in target dicts. SYMROOT is a special case, because many other
4520 # Xcode variables depend on it, including variables such as 4511 # Xcode variables depend on it, including variables such as
4521 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4512 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4522 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4513 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4523 # files to appear (when present) in the UI as actual files and not red 4514 # files to appear (when present) in the UI as actual files and not red
4524 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4515 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4525 # and therefore SYMROOT, needs to be set at the project level. 4516 # and therefore SYMROOT, needs to be set at the project level.
4526 'SYMROOT': '<(DEPTH)/xcodebuild', 4517 'SYMROOT': '<(DEPTH)/xcodebuild',
4527 }, 4518 },
4528 } 4519 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698