chrome/chrome_browser_chromeos.gypi - Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser_chromeos.gypi

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 side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_browser_chromeos.gypi

diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi

index 01a3c43dfbf8192a3c10c70a2dc354a6e0ef32bb..4a56bac2ac8eed3ecf70d54c1331413372f050a7 100644

--- a/chrome/chrome_browser_chromeos.gypi

+++ b/chrome/chrome_browser_chromeos.gypi

@@ -1104,6 +1104,13 @@

'target_name': 'browser_chromeos',

'type': 'static_library',

'variables': {

+ 'conditions': [

+ ['sysroot!=""', {

+ 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',

+ }, {

+ 'pkg-config': 'pkg-config'

+ }],

+ ],

# Override to dynamically link the cras (ChromeOS audio) library.

'use_cras%': 0,

'enable_wexit_time_destructors': 1,

« no previous file with comments | « build/linux/system.gyp ('k') | media/media.gyp » ('j') | no next file with comments »