gyp/libpng.gyp - Issue 1406153015: Remove dependencies on Android's forked decoder libraries

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

Issue 1406153015: Remove dependencies on Android's forked decoder libraries (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: It is 2015 Created 5 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: gyp/libpng.gyp

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

index 45be5f7180ded5c363694af89d928c0ebb66d186..c6014bbd5eea4b4c23df6781e3d421883fb83090 100644

--- a/gyp/libpng.gyp

+++ b/gyp/libpng.gyp

@@ -12,19 +12,6 @@

'target_name': 'libpng',

'type': 'none',

'conditions': [

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

- 'dependencies': [ 'android_deps.gyp:png' ],

- 'export_dependent_settings': [ 'android_deps.gyp:png' ],

- },{

- 'dependencies': [ 'libpng.gyp:libpng_static' ],

- 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ],

- }]

- ]

- },

- {

- 'target_name': 'libpng_static_when_possible',

- 'type': 'none',

- 'conditions': [

[ 'skia_android_framework', {

'dependencies': [ 'android_deps.gyp:png' ],

'export_dependent_settings': [ 'android_deps.gyp:png' ],

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