gyp/ports.gyp - Issue 1674053002: msan: build expat from source

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: gyp/ports.gyp

Issue 1674053002: msan: build expat from source (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fixed? Created 4 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:

Index: gyp/ports.gyp

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

index 0c2d099380c4801f2801a72e5fb5edb1269df40b..2c41ecfbf1ff3379625272825ae62c33adc0c7b4 100644

--- a/gyp/ports.gyp

+++ b/gyp/ports.gyp

@@ -88,17 +88,11 @@

'freetype.gyp:freetype',

'conditions': [

- [ 'skia_os == "android"', {

- 'dependencies': [

- 'android_deps.gyp:expat',

- ],

+ [ 'skia_android_framework', {

+ 'link_settings': { 'libraries': [ '-lexpat' ] },

}, {

- 'link_settings': {

- 'libraries': [

- '-ldl',

- '-lexpat',

- ],

- },

+ 'link_settings': { 'libraries': [ '-ldl' ] },

+ 'dependencies': [ 'expat.gyp:expat' ],

}],

[ 'skia_embedded_fonts', {

'variables': {

« no previous file with comments | « gyp/expat.gyp ('k') | platform_tools/android/gyp/dependencies.gypi » ('j') | no next file with comments »