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

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

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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 | « gpu/gles2_conform_support/BUILD.gn ('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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'EGLAPI=', 89 'EGLAPI=',
90 'EGLAPIENTRY=', 90 'EGLAPIENTRY=',
91 ], 91 ],
92 }, 92 },
93 { 93 {
94 # GN version: //gpu/gles2_conform_support 94 # GN version: //gpu/gles2_conform_support
95 'target_name': 'gles2_conform_support', 95 'target_name': 'gles2_conform_support',
96 'type': 'executable', 96 'type': 'executable',
97 'dependencies': [ 97 'dependencies': [
98 'egl_native', 98 'egl_native',
99 '../../base/allocator/allocator.gyp:allocator',
99 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 100 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
100 '../../gpu/gpu.gyp:gles2_c_lib_nocheck', 101 '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
101 '../../third_party/expat/expat.gyp:expat', 102 '../../third_party/expat/expat.gyp:expat',
102 ], 103 ],
103 'conditions': [
104 # See http://crbug.com/162998#c4 for why this is needed.
105 ['OS=="linux" and use_allocator!="none"', {
106 'dependencies': [
107 '../../base/allocator/allocator.gyp:allocator',
108 ],
109 }],
110 ],
111 'defines': [ 104 'defines': [
112 'GLES2_CONFORM_SUPPORT_ONLY', 105 'GLES2_CONFORM_SUPPORT_ONLY',
113 'GTF_GLES20', 106 'GTF_GLES20',
114 'EGLAPI=', 107 'EGLAPI=',
115 'EGLAPIENTRY=', 108 'EGLAPIENTRY=',
116 ], 109 ],
117 'sources': [ 110 'sources': [
118 '<@(bootstrap_sources_native)', 111 '<@(bootstrap_sources_native)',
119 'gles2_conform_support.c' 112 'gles2_conform_support.c'
120 ], 113 ],
121 }, 114 },
122 ], 115 ],
123 } 116 }
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/BUILD.gn ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698