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

Side by Side Diff: chrome/chrome_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 | « build/linux/system.gyp ('k') | chromeos/chromeos.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 ], 488 ],
489 }], 489 }],
490 ['enable_mdns == 1', { 490 ['enable_mdns == 1', {
491 'sources': [ 491 'sources': [
492 'common/local_discovery/local_discovery_messages.h', 492 'common/local_discovery/local_discovery_messages.h',
493 ] 493 ]
494 }], 494 }],
495 ['toolkit_uses_gtk == 1', { 495 ['toolkit_uses_gtk == 1', {
496 'dependencies': [ 496 'dependencies': [
497 '../build/linux/system.gyp:gtk', 497 '../build/linux/system.gyp:gtk',
498 '../build/linux/system.gyp:x11',
499 '../build/linux/system.gyp:xrender',
500 '../build/linux/system.gyp:xext',
498 ], 501 ],
499 'export_dependent_settings': [ 502 'export_dependent_settings': [
500 '../third_party/sqlite/sqlite.gyp:sqlite', 503 '../third_party/sqlite/sqlite.gyp:sqlite',
501 ], 504 ],
502 'link_settings': { 505 'link_settings': {
503 'libraries': [ 506 'libraries': [
504 '-lX11',
505 '-lXrender',
506 '-lXss', 507 '-lXss',
507 '-lXext',
508 ], 508 ],
509 }, 509 },
510 }], 510 }],
511 ['chromeos==1', { 511 ['chromeos==1', {
512 'sources!': [ 512 'sources!': [
513 'common/chrome_version_info_linux.cc', 513 'common/chrome_version_info_linux.cc',
514 ], 514 ],
515 }], 515 }],
516 ['OS=="mac"', { 516 ['OS=="mac"', {
517 'dependencies': [ 517 'dependencies': [
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 'common/metrics/proto/user_action_event.proto', 746 'common/metrics/proto/user_action_event.proto',
747 ], 747 ],
748 'variables': { 748 'variables': {
749 'proto_in_dir': 'common/metrics/proto', 749 'proto_in_dir': 'common/metrics/proto',
750 'proto_out_dir': 'chrome/common/metrics/proto', 750 'proto_out_dir': 'chrome/common/metrics/proto',
751 }, 751 },
752 'includes': [ '../build/protoc.gypi' ], 752 'includes': [ '../build/protoc.gypi' ],
753 }, 753 },
754 ], 754 ],
755 } 755 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698