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

Side by Side Diff: build/common.gypi

Issue 15552003: Fix ResourceLoadTiming resolution lose issue (chromium part) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Patch for landing Created 7 years, 7 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 | webkit/glue/weburlloader_impl.cc » ('j') | 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
48 # Enable HiDPI support. 51 # Enable HiDPI support.
49 'enable_hidpi%': 0, 52 'enable_hidpi%': 0,
50 53
51 # Enable touch optimized art assets and metrics. 54 # Enable touch optimized art assets and metrics.
52 'enable_touch_ui%': 0, 55 'enable_touch_ui%': 0,
53 56
54 # Override buildtype to select the desired build flavor. 57 # Override buildtype to select the desired build flavor.
55 # Dev - everyday build for development/testing 58 # Dev - everyday build for development/testing
56 # Official - release build (generally implies additional processing) 59 # Official - release build (generally implies additional processing)
57 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp 60 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 }], 97 }],
95 ], 98 ],
96 }, 99 },
97 # Copy conditionally-set variables out one scope. 100 # Copy conditionally-set variables out one scope.
98 'chromeos%': '<(chromeos)', 101 'chromeos%': '<(chromeos)',
99 'use_aura%': '<(use_aura)', 102 'use_aura%': '<(use_aura)',
100 'use_ash%': '<(use_ash)', 103 'use_ash%': '<(use_ash)',
101 'use_ozone%': '<(use_ozone)', 104 'use_ozone%': '<(use_ozone)',
102 'use_openssl%': '<(use_openssl)', 105 'use_openssl%': '<(use_openssl)',
103 'enable_viewport%': '<(enable_viewport)', 106 'enable_viewport%': '<(enable_viewport)',
107 'enable_double_resource_load_timing%': '<(enable_double_resource_load_ti ming)',
104 'enable_hidpi%': '<(enable_hidpi)', 108 'enable_hidpi%': '<(enable_hidpi)',
105 'enable_touch_ui%': '<(enable_touch_ui)', 109 'enable_touch_ui%': '<(enable_touch_ui)',
106 'buildtype%': '<(buildtype)', 110 'buildtype%': '<(buildtype)',
107 'branding%': '<(branding)', 111 'branding%': '<(branding)',
108 'host_arch%': '<(host_arch)', 112 'host_arch%': '<(host_arch)',
109 113
110 # Default architecture we're building for is the architecture we're 114 # Default architecture we're building for is the architecture we're
111 # building on. 115 # building on.
112 'target_arch%': '<(host_arch)', 116 'target_arch%': '<(host_arch)',
113 117
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 'chromeos%': '<(chromeos)', 179 'chromeos%': '<(chromeos)',
176 'host_arch%': '<(host_arch)', 180 'host_arch%': '<(host_arch)',
177 'target_arch%': '<(target_arch)', 181 'target_arch%': '<(target_arch)',
178 'toolkit_views%': '<(toolkit_views)', 182 'toolkit_views%': '<(toolkit_views)',
179 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 183 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
180 'use_aura%': '<(use_aura)', 184 'use_aura%': '<(use_aura)',
181 'use_ash%': '<(use_ash)', 185 'use_ash%': '<(use_ash)',
182 'use_ozone%': '<(use_ozone)', 186 'use_ozone%': '<(use_ozone)',
183 'use_openssl%': '<(use_openssl)', 187 'use_openssl%': '<(use_openssl)',
184 'enable_viewport%': '<(enable_viewport)', 188 'enable_viewport%': '<(enable_viewport)',
189 'enable_double_resource_load_timing%': '<(enable_double_resource_load_timi ng)',
185 'enable_hidpi%': '<(enable_hidpi)', 190 'enable_hidpi%': '<(enable_hidpi)',
186 'enable_touch_ui%': '<(enable_touch_ui)', 191 'enable_touch_ui%': '<(enable_touch_ui)',
187 'android_webview_build%': '<(android_webview_build)', 192 'android_webview_build%': '<(android_webview_build)',
188 'google_tv%': '<(google_tv)', 193 'google_tv%': '<(google_tv)',
189 'enable_app_list%': '<(enable_app_list)', 194 'enable_app_list%': '<(enable_app_list)',
190 'use_default_render_theme%': '<(use_default_render_theme)', 195 'use_default_render_theme%': '<(use_default_render_theme)',
191 'buildtype%': '<(buildtype)', 196 'buildtype%': '<(buildtype)',
192 'branding%': '<(branding)', 197 'branding%': '<(branding)',
193 'arm_version%': '<(arm_version)', 198 'arm_version%': '<(arm_version)',
194 'linux_lsb_release%': '<(linux_lsb_release)', 199 'linux_lsb_release%': '<(linux_lsb_release)',
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 'os_bsd%': '<(os_bsd)', 740 'os_bsd%': '<(os_bsd)',
736 'os_posix%': '<(os_posix)', 741 'os_posix%': '<(os_posix)',
737 'use_glib%': '<(use_glib)', 742 'use_glib%': '<(use_glib)',
738 'use_ozone%': '<(use_ozone)', 743 'use_ozone%': '<(use_ozone)',
739 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 744 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
740 'use_x11%': '<(use_x11)', 745 'use_x11%': '<(use_x11)',
741 'use_gnome_keyring%': '<(use_gnome_keyring)', 746 'use_gnome_keyring%': '<(use_gnome_keyring)',
742 'linux_fpic%': '<(linux_fpic)', 747 'linux_fpic%': '<(linux_fpic)',
743 'chromeos%': '<(chromeos)', 748 'chromeos%': '<(chromeos)',
744 'enable_viewport%': '<(enable_viewport)', 749 'enable_viewport%': '<(enable_viewport)',
750 'enable_double_resource_load_timing%': '<(enable_double_resource_load_timing )',
745 'enable_hidpi%': '<(enable_hidpi)', 751 'enable_hidpi%': '<(enable_hidpi)',
746 'enable_touch_ui%': '<(enable_touch_ui)', 752 'enable_touch_ui%': '<(enable_touch_ui)',
747 'use_xi2_mt%':'<(use_xi2_mt)', 753 'use_xi2_mt%':'<(use_xi2_mt)',
748 'file_manager_extension%': '<(file_manager_extension)', 754 'file_manager_extension%': '<(file_manager_extension)',
749 'image_loader_extension%': '<(image_loader_extension)', 755 'image_loader_extension%': '<(image_loader_extension)',
750 'fastbuild%': '<(fastbuild)', 756 'fastbuild%': '<(fastbuild)',
751 'dcheck_always_on%': '<(dcheck_always_on)', 757 'dcheck_always_on%': '<(dcheck_always_on)',
752 'python_ver%': '<(python_ver)', 758 'python_ver%': '<(python_ver)',
753 'arm_version%': '<(arm_version)', 759 'arm_version%': '<(arm_version)',
754 'armv7%': '<(armv7)', 760 'armv7%': '<(armv7)',
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1830 'xcode_settings': { 1836 'xcode_settings': {
1831 'DYLIB_INSTALL_NAME_BASE': '@rpath', 1837 'DYLIB_INSTALL_NAME_BASE': '@rpath',
1832 'LD_RUNPATH_SEARCH_PATHS': [ 1838 'LD_RUNPATH_SEARCH_PATHS': [
1833 # For unbundled binaries. 1839 # For unbundled binaries.
1834 '@loader_path/.', 1840 '@loader_path/.',
1835 # For bundled binaries, to get back from Binary.app/Contents/MacOS. 1841 # For bundled binaries, to get back from Binary.app/Contents/MacOS.
1836 '@loader_path/../../..', 1842 '@loader_path/../../..',
1837 ], 1843 ],
1838 }, 1844 },
1839 }], 1845 }],
1846 ['enable_double_resource_load_timing==1', {
1847 'defines': ['ENABLE_DOUBLE_RESOURCE_LOAD_TIMING'],
1848 }],
1840 ['enable_rlz==1', { 1849 ['enable_rlz==1', {
1841 'defines': ['ENABLE_RLZ'], 1850 'defines': ['ENABLE_RLZ'],
1842 }], 1851 }],
1843 ['component=="shared_library"', { 1852 ['component=="shared_library"', {
1844 'defines': ['COMPONENT_BUILD'], 1853 'defines': ['COMPONENT_BUILD'],
1845 }], 1854 }],
1846 ['toolkit_views==1', { 1855 ['toolkit_views==1', {
1847 'defines': ['TOOLKIT_VIEWS=1'], 1856 'defines': ['TOOLKIT_VIEWS=1'],
1848 }], 1857 }],
1849 ['ui_compositor_image_transport==1', { 1858 ['ui_compositor_image_transport==1', {
(...skipping 2590 matching lines...) Expand 10 before | Expand all | Expand 10 after
4440 # settings in target dicts. SYMROOT is a special case, because many other 4449 # settings in target dicts. SYMROOT is a special case, because many other
4441 # Xcode variables depend on it, including variables such as 4450 # Xcode variables depend on it, including variables such as
4442 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4451 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4443 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4452 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4444 # files to appear (when present) in the UI as actual files and not red 4453 # files to appear (when present) in the UI as actual files and not red
4445 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4454 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4446 # and therefore SYMROOT, needs to be set at the project level. 4455 # and therefore SYMROOT, needs to be set at the project level.
4447 'SYMROOT': '<(DEPTH)/xcodebuild', 4456 'SYMROOT': '<(DEPTH)/xcodebuild',
4448 }, 4457 },
4449 } 4458 }
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/weburlloader_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698