gyp/core.gyp - Issue 15855006: prepare skia for shared library build on android

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/core.gyp

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebasing Created 7 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:

Index: gyp/core.gyp

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

index 9e0792b7734be1dfced1715b21bf3fe93838eef6..d018cbea234d35a88cc615cebbf28f64b592ff91 100644

--- a/gyp/core.gyp

+++ b/gyp/core.gyp

@@ -76,6 +76,11 @@

'config/win',

}],

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

+ 'sources': [

+ '../src/core/SkPaintOptionsAndroid.cpp',

+ ],

+ }],

[ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {

# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.

'sources': [

@@ -120,9 +125,6 @@

}],

- 'dependencies': [

- 'opts.gyp:opts'

- ],

}

« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/debugger.gyp » ('j') | no next file with comments »