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

Side by Side Diff: build/common.gypi

Issue 7860028: Retry 3 to split WebGraphicsContext3DCommandBufferImpl::initialize() into two stages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fold thread fixes into this patch. Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/gpu/command_buffer_proxy.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 # Set to select the Title Case versions of strings in GRD files. 170 # Set to select the Title Case versions of strings in GRD files.
171 'use_titlecase_in_grd_files%': 0, 171 'use_titlecase_in_grd_files%': 0,
172 172
173 # Use translations provided by volunteers at launchpad.net. This 173 # Use translations provided by volunteers at launchpad.net. This
174 # currently only works on Linux. 174 # currently only works on Linux.
175 'use_third_party_translations%': 0, 175 'use_third_party_translations%': 0,
176 176
177 # Remoting compilation is enabled by default. Set to 0 to disable. 177 # Remoting compilation is enabled by default. Set to 0 to disable.
178 'remoting%': 1, 178 'remoting%': 1,
179 179
180 # Threaded compositing
181 'use_threaded_compositing%': 0,
182
180 # P2P APIs are compiled in by default. Set to 0 to disable. 183 # P2P APIs are compiled in by default. Set to 0 to disable.
181 # Also note that this should be enabled for remoting to compile. 184 # Also note that this should be enabled for remoting to compile.
182 'p2p_apis%': 1, 185 'p2p_apis%': 1,
183 186
184 # Configuration policy is enabled by default. Set to 0 to disable. 187 # Configuration policy is enabled by default. Set to 0 to disable.
185 'configuration_policy%': 1, 188 'configuration_policy%': 1,
186 189
187 # Safe browsing is compiled in by default. Set to 0 to disable. 190 # Safe browsing is compiled in by default. Set to 0 to disable.
188 'safe_browsing%': 1, 191 'safe_browsing%': 1,
189 192
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 'fastbuild%': '<(fastbuild)', 315 'fastbuild%': '<(fastbuild)',
313 'python_ver%': '<(python_ver)', 316 'python_ver%': '<(python_ver)',
314 'armv7%': '<(armv7)', 317 'armv7%': '<(armv7)',
315 'arm_neon%': '<(arm_neon)', 318 'arm_neon%': '<(arm_neon)',
316 'sysroot%': '<(sysroot)', 319 'sysroot%': '<(sysroot)',
317 'disable_sse2%': '<(disable_sse2)', 320 'disable_sse2%': '<(disable_sse2)',
318 'component%': '<(component)', 321 'component%': '<(component)',
319 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 322 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
320 'use_third_party_translations%': '<(use_third_party_translations)', 323 'use_third_party_translations%': '<(use_third_party_translations)',
321 'remoting%': '<(remoting)', 324 'remoting%': '<(remoting)',
325 'use_threaded_compositing%': '<(use_threaded_compositing)',
322 'enable_webrtc%': '<(enable_webrtc)', 326 'enable_webrtc%': '<(enable_webrtc)',
323 'p2p_apis%': '<(p2p_apis)', 327 'p2p_apis%': '<(p2p_apis)',
324 'configuration_policy%': '<(configuration_policy)', 328 'configuration_policy%': '<(configuration_policy)',
325 'safe_browsing%': '<(safe_browsing)', 329 'safe_browsing%': '<(safe_browsing)',
326 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 330 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
327 'asan%': '<(asan)', 331 'asan%': '<(asan)',
328 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 332 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
329 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 333 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
330 'enable_web_intents%': '<(enable_web_intents)', 334 'enable_web_intents%': '<(enable_web_intents)',
331 # Whether to build for Wayland display server 335 # Whether to build for Wayland display server
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 'defines': ['ENABLE_PROFILING=1'], 817 'defines': ['ENABLE_PROFILING=1'],
814 }], 818 }],
815 ['OS=="linux" and glibcxx_debug==1', { 819 ['OS=="linux" and glibcxx_debug==1', {
816 'defines': ['_GLIBCXX_DEBUG=1',], 820 'defines': ['_GLIBCXX_DEBUG=1',],
817 'cflags_cc!': ['-fno-rtti'], 821 'cflags_cc!': ['-fno-rtti'],
818 'cflags_cc+': ['-frtti', '-g'], 822 'cflags_cc+': ['-frtti', '-g'],
819 }], 823 }],
820 ['remoting==1', { 824 ['remoting==1', {
821 'defines': ['ENABLE_REMOTING=1'], 825 'defines': ['ENABLE_REMOTING=1'],
822 }], 826 }],
827 ['use_threaded_compositing==1', {
828 'defines': ['WTF_USE_THREADED_COMPOSITING'],
829 }],
823 ['p2p_apis==1', { 830 ['p2p_apis==1', {
824 'defines': ['ENABLE_P2P_APIS=1'], 831 'defines': ['ENABLE_P2P_APIS=1'],
825 }], 832 }],
826 ['proprietary_codecs==1', { 833 ['proprietary_codecs==1', {
827 'defines': ['USE_PROPRIETARY_CODECS'], 834 'defines': ['USE_PROPRIETARY_CODECS'],
828 }], 835 }],
829 ['enable_flapper_hacks==1', { 836 ['enable_flapper_hacks==1', {
830 'defines': ['ENABLE_FLAPPER_HACKS=1'], 837 'defines': ['ENABLE_FLAPPER_HACKS=1'],
831 }], 838 }],
832 ['configuration_policy==1', { 839 ['configuration_policy==1', {
833 'defines': ['ENABLE_CONFIGURATION_POLICY'], 840 'defines': ['ENABLE_CONFIGURATION_POLICY'],
834 }], 841 }],
835 ['fastbuild!=0', { 842 ['fastbuild!=0', {
843
836 'conditions': [ 844 'conditions': [
837 # For Windows, we don't genererate debug information. 845 # For Windows, we don't genererate debug information.
838 ['OS=="win"', { 846 ['OS=="win"', {
839 'msvs_settings': { 847 'msvs_settings': {
840 'VCLinkerTool': { 848 'VCLinkerTool': {
841 'GenerateDebugInformation': 'false', 849 'GenerateDebugInformation': 'false',
842 }, 850 },
843 'VCCLCompilerTool': { 851 'VCCLCompilerTool': {
844 'DebugInformationFormat': '0', 852 'DebugInformationFormat': '0',
845 } 853 }
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after
2052 # settings in target dicts. SYMROOT is a special case, because many other 2060 # settings in target dicts. SYMROOT is a special case, because many other
2053 # Xcode variables depend on it, including variables such as 2061 # Xcode variables depend on it, including variables such as
2054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2062 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2063 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2056 # files to appear (when present) in the UI as actual files and not red 2064 # files to appear (when present) in the UI as actual files and not red
2057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2065 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2058 # and therefore SYMROOT, needs to be set at the project level. 2066 # and therefore SYMROOT, needs to be set at the project level.
2059 'SYMROOT': '<(DEPTH)/xcodebuild', 2067 'SYMROOT': '<(DEPTH)/xcodebuild',
2060 }, 2068 },
2061 } 2069 }
OLDNEW
« no previous file with comments | « no previous file | content/renderer/gpu/command_buffer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698