Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Move logic out of codec.gyp and images.gyp 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:
View side-by-side diff with in-line comments
Download patch
« gyp/libjpeg-turbo-selector.gyp ('K') | « gyp/libjpeg-turbo-selector.gyp ('k') | platform_tools/android/gyp/dependencies.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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' ],
« gyp/libjpeg-turbo-selector.gyp ('K') | « gyp/libjpeg-turbo-selector.gyp ('k') | platform_tools/android/gyp/dependencies.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698