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

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

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser_chromeos.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 'variables': { 6 'variables': {
7 'conditions': [
8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 }, {
11 'pkg-config': 'pkg-config',
12 }],
13 ],
14
7 # If any of the linux_link_FOO below are set to 1, then the corresponding 15 # If any of the linux_link_FOO below are set to 1, then the corresponding
8 # target will be linked against the FOO library (either dynamically or 16 # target will be linked against the FOO library (either dynamically or
9 # statically, depending on the pkg-config files), as opposed to loading the 17 # statically, depending on the pkg-config files), as opposed to loading the
10 # FOO library dynamically with dlopen. 18 # FOO library dynamically with dlopen.
11 'linux_link_libgps%': 0, 19 'linux_link_libgps%': 0,
12 'linux_link_libpci%': 0, 20 'linux_link_libpci%': 0,
13 'linux_link_libspeechd%': 0, 21 'linux_link_libspeechd%': 0,
14 'linux_link_libbrlapi%': 0, 22 'linux_link_libbrlapi%': 0,
15 23
16 # Used below for the various libraries. In this scope for sharing with GN. 24 # Used below for the various libraries. In this scope for sharing with GN.
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1213 }, 1221 },
1214 }], 1222 }],
1215 ], 1223 ],
1216 }], 1224 }],
1217 ] 1225 ]
1218 }], 1226 }],
1219 ], 1227 ],
1220 }, 1228 },
1221 ], 1229 ],
1222 } 1230 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698