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

Side by Side Diff: ui/aura/aura.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 | « remoting/remoting_host.gypi ('k') | ui/gl/gl.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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 'window_layer_type.h', 113 'window_layer_type.h',
114 'window_observer.h', 114 'window_observer.h',
115 'window_tracker.cc', 115 'window_tracker.cc',
116 'window_tracker.h', 116 'window_tracker.h',
117 'window_tree_host.cc', 117 'window_tree_host.cc',
118 'window_tree_host.h', 118 'window_tree_host.h',
119 'window_tree_host_delegate.h', 119 'window_tree_host_delegate.h',
120 ], 120 ],
121 'conditions': [ 121 'conditions': [
122 ['use_x11==1', { 122 ['use_x11==1', {
123 'link_settings': { 123 'dependencies': [
124 'libraries': [ 124 '../../build/linux/system.gyp:x11',
125 '-lX11', 125 '../../build/linux/system.gyp:xfixes',
126 '-lXi', 126 '../../build/linux/system.gyp:xrandr',
127 '-lXfixes', 127 '../../build/linux/system.gyp:xi',
128 '-lXrandr', 128 ],
129 ],
130 },
131 }], 129 }],
132 ['OS=="win"', { 130 ['OS=="win"', {
133 'dependencies': [ 131 'dependencies': [
134 '../metro_viewer/metro_viewer.gyp:metro_viewer_messages', 132 '../metro_viewer/metro_viewer.gyp:metro_viewer_messages',
135 '../../ipc/ipc.gyp:ipc', 133 '../../ipc/ipc.gyp:ipc',
136 ], 134 ],
137 'sources!': [ 135 'sources!': [
138 'input_state_lookup.cc', 136 'input_state_lookup.cc',
139 ], 137 ],
140 }], 138 }],
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 ['OS=="linux" and linux_use_tcmalloc==1', { 284 ['OS=="linux" and linux_use_tcmalloc==1', {
287 'dependencies': [ 285 'dependencies': [
288 # See http://crbug.com/162998#c4 for why this is needed. 286 # See http://crbug.com/162998#c4 for why this is needed.
289 '../../base/allocator/allocator.gyp:allocator', 287 '../../base/allocator/allocator.gyp:allocator',
290 ], 288 ],
291 }], 289 }],
292 ], 290 ],
293 }, 291 },
294 ], 292 ],
295 } 293 }
OLDNEW
« no previous file with comments | « remoting/remoting_host.gypi ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698