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

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

Issue 15378003: Make gles2_conform_support depend on allocator.gyp:allocator when necessary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug link 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 | Annotate | Revision Log
« 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 { 5 {
6 'variables': { 6 'variables': {
7 # These are defined here because we want to be able to compile them on 7 # These are defined here because we want to be able to compile them on
8 # the buildbots without needed the OpenGL ES 2.0 conformance tests 8 # the buildbots without needed the OpenGL ES 2.0 conformance tests
9 # which are not open source. 9 # which are not open source.
10 'bootstrap_sources_native': [ 10 'bootstrap_sources_native': [
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 'dependencies': [ 107 'dependencies': [
108 'egl_native', 108 'egl_native',
109 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 109 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
110 '../../gpu/gpu.gyp:gles2_c_lib_nocheck', 110 '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
111 '../../third_party/expat/expat.gyp:expat', 111 '../../third_party/expat/expat.gyp:expat',
112 ], 112 ],
113 'conditions': [ 113 'conditions': [
114 ['toolkit_uses_gtk == 1', { 114 ['toolkit_uses_gtk == 1', {
115 'dependencies': ['../../build/linux/system.gyp:gtk'], 115 'dependencies': ['../../build/linux/system.gyp:gtk'],
116 }], 116 }],
117 # See http://crbug.com/162998#c4 for why this is needed.
118 ['OS=="linux" and linux_use_tcmalloc==1', {
119 'dependencies': [
120 '../../base/allocator/allocator.gyp:allocator',
121 ],
122 }],
117 ], 123 ],
118 'defines': [ 124 'defines': [
119 'GLES2_CONFORM_SUPPORT_ONLY', 125 'GLES2_CONFORM_SUPPORT_ONLY',
120 'GTF_GLES20', 126 'GTF_GLES20',
121 'EGLAPI=', 127 'EGLAPI=',
122 'EGLAPIENTRY=', 128 'EGLAPIENTRY=',
123 ], 129 ],
124 'sources': [ 130 'sources': [
125 '<@(bootstrap_sources_native)', 131 '<@(bootstrap_sources_native)',
126 'gles2_conform_support.c' 132 'gles2_conform_support.c'
127 ], 133 ],
128 }, 134 },
129 ], 135 ],
130 } 136 }
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