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

Side by Side Diff: gpu/command_buffer_service.gypi

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « gpu/command_buffer/service/BUILD.gn ('k') | media/BUILD.gn » ('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 'include_dirs': [ 6 'include_dirs': [
7 '..', 7 '..',
8 ], 8 ],
9 'all_dependent_settings': { 9 'all_dependent_settings': {
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'command_buffer/service/vertex_array_manager.h', 135 'command_buffer/service/vertex_array_manager.h',
136 'command_buffer/service/vertex_attrib_manager.cc', 136 'command_buffer/service/vertex_attrib_manager.cc',
137 'command_buffer/service/vertex_attrib_manager.h', 137 'command_buffer/service/vertex_attrib_manager.h',
138 ], 138 ],
139 'conditions': [ 139 'conditions': [
140 ['ui_compositor_image_transport==1', { 140 ['ui_compositor_image_transport==1', {
141 'include_dirs': [ 141 'include_dirs': [
142 '../third_party/khronos', 142 '../third_party/khronos',
143 ], 143 ],
144 }], 144 }],
145 ['OS=="mac"', {
146 # Required by gles2_cmd_decoder.cc on Mac.
147 'link_settings': {
148 'libraries': [
149 '$(SDKROOT)/System/Library/Frameworks/IOSurface.framework',
150 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
151 ],
152 },
153 }],
154 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 145 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
155 'sources': [ 146 'sources': [
156 'command_buffer/service/async_pixel_transfer_manager_egl.cc', 147 'command_buffer/service/async_pixel_transfer_manager_egl.cc',
157 'command_buffer/service/async_pixel_transfer_manager_egl.h', 148 'command_buffer/service/async_pixel_transfer_manager_egl.h',
158 ], 149 ],
159 }], 150 }],
160 ], 151 ],
161 } 152 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/BUILD.gn ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698