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

Side by Side Diff: content/content_common.gypi

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address feedback, try to fix cros_x86 gyp error Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/chromeos.gyp ('k') | content/content_plugin.gypi » ('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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 '../build/linux/system.gyp:pangocairo', 491 '../build/linux/system.gyp:pangocairo',
492 ], 492 ],
493 'sources!': [ 493 'sources!': [
494 'common/font_list_ozone.cc', 494 'common/font_list_ozone.cc',
495 ], 495 ],
496 }], 496 }],
497 ['use_x11 == 1', { 497 ['use_x11 == 1', {
498 'include_dirs': [ 498 'include_dirs': [
499 '<(DEPTH)/third_party/khronos', 499 '<(DEPTH)/third_party/khronos',
500 ], 500 ],
501 'link_settings': { 501 'dependencies': [
502 'libraries': [ 502 '<(DEPTH)/build/linux/system.gyp:xcomposite',
503 '-lXcomposite', 503 ],
504 ],
505 },
506 }], 504 }],
507 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 505 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
508 'sources': [ 506 'sources': [
509 'common/gpu/x_util.cc', 507 'common/gpu/x_util.cc',
510 'common/gpu/x_util.h', 508 'common/gpu/x_util.h',
511 ], 509 ],
512 }], 510 }],
513 ['enable_plugins==1', { 511 ['enable_plugins==1', {
514 'dependencies': [ 512 'dependencies': [
515 '../ppapi/ppapi_internal.gyp:ppapi_shared', 513 '../ppapi/ppapi_internal.gyp:ppapi_shared',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 645 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
648 'common/sandbox_linux/bpf_renderer_policy_linux.h', 646 'common/sandbox_linux/bpf_renderer_policy_linux.h',
649 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 647 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
650 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 648 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
651 ], 649 ],
652 }, { 650 }, {
653 'defines': ['USE_SECCOMP_BPF'], 651 'defines': ['USE_SECCOMP_BPF'],
654 }], 652 }],
655 ], 653 ],
656 } 654 }
OLDNEW
« no previous file with comments | « chromeos/chromeos.gyp ('k') | content/content_plugin.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698