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

Side by Side Diff: build/linux/system.gyp

Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files. (Closed)
Patch Set: 2nd round of feedback Created 11 years, 3 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
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'conditions': [
7 'includes': [ 7 ['sysroot!=""', {
8 '../common.gypi', 8 'variables': {
9 ],
10 'conditions': [
11 ['sysroot!=""', {
12 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
13 }, { 10 },
11 }, {
12 'variables': {
14 'pkg-config': 'pkg-config' 13 'pkg-config': 'pkg-config'
15 }], 14 },
16 ], 15 }],
17 }, 16 ],
17
18 'targets': [ 18 'targets': [
19 { 19 {
20 'target_name': 'gtk', 20 'target_name': 'gtk',
21 'type': 'settings', 21 'type': 'settings',
22 'direct_dependent_settings': { 22 'direct_dependent_settings': {
23 'cflags': [ 23 'cflags': [
24 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)', 24 '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
25 ], 25 ],
26 }, 26 },
27 'link_settings': { 27 'link_settings': {
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 # 'ldflags': [ 167 # 'ldflags': [
168 # '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', 168 # '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
169 # ], 169 # ],
170 # 'libraries': [ 170 # 'libraries': [
171 # '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', 171 # '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
172 # ], 172 # ],
173 # }, 173 # },
174 # }, 174 # },
175 ], 175 ],
176 } 176 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698