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

Side by Side Diff: gpu/gles2_conform_support/gles2_conform_support.gyp

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 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 | Annotate | Revision Log
« no previous file with comments | « device/device_tests.gyp ('k') | gpu/gpu.gyp » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # These are defined here because we want to be able to compile them on 8 # These are defined here because we want to be able to compile them on
9 # the buildbots without needed the OpenGL ES 2.0 conformance tests 9 # the buildbots without needed the OpenGL ES 2.0 conformance tests
10 # which are not open source. 10 # which are not open source.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'target_name': 'gles2_conform_support', 100 'target_name': 'gles2_conform_support',
101 'type': 'executable', 101 'type': 'executable',
102 'dependencies': [ 102 'dependencies': [
103 'egl_native', 103 'egl_native',
104 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 104 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
105 '../../gpu/gpu.gyp:gles2_c_lib_nocheck', 105 '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
106 '../../third_party/expat/expat.gyp:expat', 106 '../../third_party/expat/expat.gyp:expat',
107 ], 107 ],
108 'conditions': [ 108 'conditions': [
109 # See http://crbug.com/162998#c4 for why this is needed. 109 # See http://crbug.com/162998#c4 for why this is needed.
110 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 110 ['OS=="linux" and use_allocator!="none"', {
111 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
112 'dependencies': [ 111 'dependencies': [
113 '../../base/allocator/allocator.gyp:allocator', 112 '../../base/allocator/allocator.gyp:allocator',
114 ], 113 ],
115 }], 114 }],
116 ], 115 ],
117 'defines': [ 116 'defines': [
118 'GLES2_CONFORM_SUPPORT_ONLY', 117 'GLES2_CONFORM_SUPPORT_ONLY',
119 'GTF_GLES20', 118 'GTF_GLES20',
120 'EGLAPI=', 119 'EGLAPI=',
121 'EGLAPIENTRY=', 120 'EGLAPIENTRY=',
122 ], 121 ],
123 'sources': [ 122 'sources': [
124 '<@(bootstrap_sources_native)', 123 '<@(bootstrap_sources_native)',
125 'gles2_conform_support.c' 124 'gles2_conform_support.c'
126 ], 125 ],
127 }, 126 },
128 ], 127 ],
129 } 128 }
OLDNEW
« no previous file with comments | « device/device_tests.gyp ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698