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

Side by Side Diff: content/content_common.gypi

Issue 8676009: fix content build on !linux && use_x11 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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 | « 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../gpu/gpu.gyp:gpu_ipc', 9 '../gpu/gpu.gyp:gpu_ipc',
10 '../ipc/ipc.gyp:ipc', 10 '../ipc/ipc.gyp:ipc',
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 }], 287 }],
288 ['toolkit_uses_gtk == 1', { 288 ['toolkit_uses_gtk == 1', {
289 'dependencies': [ 289 'dependencies': [
290 '../build/linux/system.gyp:gtk', 290 '../build/linux/system.gyp:gtk',
291 ], 291 ],
292 }], 292 }],
293 ['use_x11 == 1', { 293 ['use_x11 == 1', {
294 'dependencies': [ 294 'dependencies': [
295 '../build/linux/system.gyp:pangocairo', 295 '../build/linux/system.gyp:pangocairo',
296 ], 296 ],
297 }],
298 ['use_x11 == 1 and target_arch != "arm"', {
299 'sources': [
300 'common/gpu/x_util.cc',
301 'common/gpu/x_util.h',
302 ],
303 }],
304 ['OS=="linux"', {
305 'include_dirs': [ 297 'include_dirs': [
306 '<(DEPTH)/third_party/angle/include', 298 '<(DEPTH)/third_party/angle/include',
307 ], 299 ],
308 'link_settings': { 300 'link_settings': {
309 'libraries': [ 301 'libraries': [
310 '-lXcomposite', 302 '-lXcomposite',
311 ], 303 ],
312 }, 304 },
313 }], 305 }],
306 ['use_x11 == 1 and target_arch != "arm"', {
307 'sources': [
308 'common/gpu/x_util.cc',
309 'common/gpu/x_util.h',
310 ],
311 }],
314 ['enable_gpu==1', { 312 ['enable_gpu==1', {
315 'dependencies': [ 313 'dependencies': [
316 '../gpu/gpu.gyp:command_buffer_service', 314 '../gpu/gpu.gyp:command_buffer_service',
317 ], 315 ],
318 }], 316 }],
319 ['target_arch=="arm"', { 317 ['target_arch=="arm"', {
320 'dependencies': [ 318 'dependencies': [
321 '../media/media.gyp:media', 319 '../media/media.gyp:media',
322 ], 320 ],
323 'sources': [ 321 'sources': [
324 'common/gpu/media/gles2_texture_to_egl_image_translator.cc', 322 'common/gpu/media/gles2_texture_to_egl_image_translator.cc',
325 'common/gpu/media/gles2_texture_to_egl_image_translator.h', 323 'common/gpu/media/gles2_texture_to_egl_image_translator.h',
326 'common/gpu/media/omx_video_decode_accelerator.cc', 324 'common/gpu/media/omx_video_decode_accelerator.cc',
327 'common/gpu/media/omx_video_decode_accelerator.h', 325 'common/gpu/media/omx_video_decode_accelerator.h',
328 ], 326 ],
329 'include_dirs': [ 327 'include_dirs': [
330 '<(DEPTH)/third_party/angle/include', 328 '<(DEPTH)/third_party/angle/include',
331 '<(DEPTH)/third_party/openmax/il', 329 '<(DEPTH)/third_party/openmax/il',
332 ], 330 ],
333 'link_settings': { 331 'link_settings': {
334 'libraries': [ 332 'libraries': [
335 '-lEGL', 333 '-lEGL',
336 '-lGLESv2', 334 '-lGLESv2',
337 ], 335 ],
338 }, 336 },
339 }], 337 }],
340 ], 338 ],
341 } 339 }
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