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

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

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 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 | « gpu/command_buffer_service.gypi ('k') | ipc/ipc.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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 'EGLAPIENTRY=', 76 'EGLAPIENTRY=',
77 ], 77 ],
78 }, 78 },
79 { 79 {
80 'target_name': 'egl_main_windowless', 80 'target_name': 'egl_main_windowless',
81 'type': 'static_library', 81 'type': 'static_library',
82 'dependencies': [ 82 'dependencies': [
83 'egl_native', 83 'egl_native',
84 '../../third_party/khronos/khronos.gyp:khronos_headers', 84 '../../third_party/khronos/khronos.gyp:khronos_headers',
85 ], 85 ],
86 'conditions': [
87 ['toolkit_uses_gtk == 1', {
88 'dependencies': ['../../build/linux/system.gyp:gtk'],
89 }],
90 ],
91 'sources': [ 86 'sources': [
92 'native/main.cc', 87 'native/main.cc',
93 'native/egl_native.cc', 88 'native/egl_native.cc',
94 'native/egl_native_windowless.cc', 89 'native/egl_native_windowless.cc',
95 '<@(bootstrap_sources_native)', 90 '<@(bootstrap_sources_native)',
96 ], 91 ],
97 'defines': [ 92 'defines': [
98 'GLES2_CONFORM_SUPPORT_ONLY', 93 'GLES2_CONFORM_SUPPORT_ONLY',
99 'GTF_GLES20', 94 'GTF_GLES20',
100 'EGLAPI=', 95 'EGLAPI=',
101 'EGLAPIENTRY=', 96 'EGLAPIENTRY=',
102 ], 97 ],
103 }, 98 },
104 { 99 {
105 'target_name': 'gles2_conform_support', 100 'target_name': 'gles2_conform_support',
106 'type': 'executable', 101 'type': 'executable',
107 'dependencies': [ 102 'dependencies': [
108 'egl_native', 103 'egl_native',
109 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 104 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
110 '../../gpu/gpu.gyp:gles2_c_lib_nocheck', 105 '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
111 '../../third_party/expat/expat.gyp:expat', 106 '../../third_party/expat/expat.gyp:expat',
112 ], 107 ],
113 'conditions': [ 108 'conditions': [
114 ['toolkit_uses_gtk == 1', {
115 'dependencies': ['../../build/linux/system.gyp:gtk'],
116 }],
117 # See http://crbug.com/162998#c4 for why this is needed. 109 # See http://crbug.com/162998#c4 for why this is needed.
118 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 110 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
119 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { 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))', {
120 'dependencies': [ 112 'dependencies': [
121 '../../base/allocator/allocator.gyp:allocator', 113 '../../base/allocator/allocator.gyp:allocator',
122 ], 114 ],
123 }], 115 }],
124 ], 116 ],
125 'defines': [ 117 'defines': [
126 'GLES2_CONFORM_SUPPORT_ONLY', 118 'GLES2_CONFORM_SUPPORT_ONLY',
127 'GTF_GLES20', 119 'GTF_GLES20',
128 'EGLAPI=', 120 'EGLAPI=',
129 'EGLAPIENTRY=', 121 'EGLAPIENTRY=',
130 ], 122 ],
131 'sources': [ 123 'sources': [
132 '<@(bootstrap_sources_native)', 124 '<@(bootstrap_sources_native)',
133 'gles2_conform_support.c' 125 'gles2_conform_support.c'
134 ], 126 ],
135 }, 127 },
136 ], 128 ],
137 } 129 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | ipc/ipc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698