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

Unified Diff: gyp/libpng.gyp

Issue 1304443002: Have DM manually encode its .png outputs. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fixed? Created 5 years, 4 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:
View side-by-side diff with in-line comments
Download patch
« dm/DM.cpp ('K') | « gyp/dm.gypi ('k') | no next file » | 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 d918f2d403db2c795fd1d74980d9f819b5190039..45be5f7180ded5c363694af89d928c0ebb66d186 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -12,23 +12,26 @@
'target_name': 'libpng',
'type': 'none',
'conditions': [
- [ 'skia_os == "android"',
- {
- 'dependencies': [
- 'android_deps.gyp:png',
- ],
- 'export_dependent_settings': [
- 'android_deps.gyp:png',
- ],
- }, { # skia_os != "android"
- 'dependencies': [
- 'libpng.gyp:libpng_static',
- ],
- 'export_dependent_settings': [
- 'libpng.gyp:libpng_static',
- ],
- }
- ]
+ [ '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' ],
+ },{
+ 'dependencies': [ 'libpng.gyp:libpng_static' ],
+ 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ],
+ }]
]
},
{
@@ -83,7 +86,7 @@
'defines': [
'PNG_ARM_NEON_OPT=0',
],
- }, { # skia_os != "ios"
+ }, { # skia_os != "ios"
'dependencies': [
'libpng.gyp:libpng_static_neon',
],
« dm/DM.cpp ('K') | « gyp/dm.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698