media/media.gyp - 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: media/media.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 side-by-side diff with in-line comments

Download patch

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 50cf76057062602fc03ea5b7241b3d2c9150b84f..f0ebe41f7b7d74e344996acea5520091f697efd7 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -34,6 +34,11 @@

}, {

'use_alsa%': 0,

'use_pulseaudio%': 0,

+ }],

+ ['sysroot!=""', {

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

+ }, {

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

}],

# low memory buffer is used in non-Android based chromecast build due to hardware limitation.

['chromecast==1 and OS!="android"', {

« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | net/third_party/nss/ssl.gyp » ('j') | no next file with comments »