gyp/core.gyp - Issue 154053002: Reland "Gyp file changes for the android framework."

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 154053002: Reland "Gyp file changes for the android framework." (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fix android build. Created 6 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/core.gyp

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

index 8c5270e691b6be35c3b0a56ed01a35d94b4955c7..187c02b392fbdaf72a56018a8c28855af213975d 100644

--- a/gyp/core.gyp

+++ b/gyp/core.gyp

@@ -80,6 +80,12 @@

'android_deps.gyp:cpu_features',

}],

+ [ 'skia_android_framework', {

+ 'libraries': [

+ # Required for SkAtomics_android.h

+ '-lcutils',

+ ],

+ }],

[ 'skia_arch_type == "arm"', {

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

'sources': [

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