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

Side by Side Diff: ui/views/views.gyp

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 | « ui/ui.gyp ('k') | webkit/common/webkit_common.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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 'win/scoped_fullscreen_visibility.h', 601 'win/scoped_fullscreen_visibility.h',
602 'widget/widget_hwnd_utils.cc', 602 'widget/widget_hwnd_utils.cc',
603 'widget/widget_hwnd_utils.h', 603 'widget/widget_hwnd_utils.h',
604 ], 604 ],
605 }], 605 }],
606 ['use_ozone==1', { 606 ['use_ozone==1', {
607 'dependencies': [ 607 'dependencies': [
608 '../ozone/ozone.gyp:ozone', 608 '../ozone/ozone.gyp:ozone',
609 ], 609 ],
610 }], 610 }],
611 ['use_x11==1', {
612 'dependencies': [
613 '../../build/linux/system.gyp:x11',
614 '../../build/linux/system.gyp:xrandr',
615 ],
616 }],
611 ], 617 ],
612 }, # target_name: views 618 }, # target_name: views
613 { 619 {
614 'target_name': 'views_test_support', 620 'target_name': 'views_test_support',
615 'type': 'static_library', 621 'type': 'static_library',
616 'dependencies': [ 622 'dependencies': [
617 '../../base/base.gyp:base', 623 '../../base/base.gyp:base',
618 '../../ipc/ipc.gyp:test_support_ipc', 624 '../../ipc/ipc.gyp:test_support_ipc',
619 '../../skia/skia.gyp:skia', 625 '../../skia/skia.gyp:skia',
620 '../../testing/gtest.gyp:gtest', 626 '../../testing/gtest.gyp:gtest',
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 'sources/': [ 1089 'sources/': [
1084 # This is needed because the aura rule strips it from the default 1090 # This is needed because the aura rule strips it from the default
1085 # sources list. 1091 # sources list.
1086 ['include', '^../../content/app/startup_helper_win.cc'], 1092 ['include', '^../../content/app/startup_helper_win.cc'],
1087 ], 1093 ],
1088 }], 1094 }],
1089 ], 1095 ],
1090 }, # target_name: views_examples_with_content_exe 1096 }, # target_name: views_examples_with_content_exe
1091 ], 1097 ],
1092 } 1098 }
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | webkit/common/webkit_common.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698