platform_tools/android/gyp/skia_android.gypi - Issue 61893008: Support linking skia statically 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: platform_tools/android/gyp/skia_android.gypi

Issue 61893008: Support linking skia statically on Android (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: rebase Created 7 years, 1 month 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: platform_tools/android/gyp/skia_android.gypi

diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi

index d4f865a1ae007bede00e08baa69c7f0bcdd6df49..270b934baf94b496e8900541e40bae99d52e59c4 100644

--- a/platform_tools/android/gyp/skia_android.gypi

+++ b/platform_tools/android/gyp/skia_android.gypi

@@ -30,9 +30,16 @@

# still build.

{

'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)',

- 'files': [

- '<(SHARED_LIB_DIR)/libSampleApp.so',

- '<(SHARED_LIB_DIR)/libskia_android.so',

+ 'conditions': [

+ [ 'skia_shared_lib', {

+ 'files': [

+ '<(SHARED_LIB_DIR)/libSampleApp.so',

+ '<(SHARED_LIB_DIR)/libskia_android.so',

+ ]}, {

+ 'files': [

+ '<(SHARED_LIB_DIR)/libSampleApp.so',

+ ]}

+ ],