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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libpng.gyp

Issue 1032253003: Enable both static and dynamically linked libpng (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 9 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
« gyp/codec.gyp ('K') | « gyp/common_variables.gypi ('k') | src/codec/SkCodec_libpng.h » ('j') | src/codec/SkCodec_libpng.h » ('J')
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 1ca6eef25343498577152b422f2c8ebf48c4c573..7e2e4b2a677ba29ca5f37cd2214c090434156e38 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -10,90 +10,92 @@
'targets': [
{
'target_name': 'libpng',
+ 'type': 'none',
'conditions': [
- [ 'skia_libpng_static',
+ [ 'skia_os == "android"',
{
- 'type': 'static_library',
- 'include_dirs': [
- '../third_party/externals/libpng',
- # Needed for generated pnglibconf.h
- '../third_party/libpng',
- ],
'dependencies': [
- 'zlib.gyp:zlib',
+ 'android_deps.gyp:png',
],
'export_dependent_settings': [
- 'zlib.gyp:zlib',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/externals/libpng',
- # Needed for generated pnglibconf.h
- '../third_party/libpng',
- ],
- },
- 'cflags': [
- '-w',
- '-fvisibility=hidden',
+ 'android_deps.gyp:png',
],
- 'conditions': [
- ['not arm_neon', {
- 'defines': [
- # FIXME: Why is this needed? Without it, pngpriv.h sets it
- # to 2 if __ARM_NEON is defined, but shouldn't __ARM_NEON
- # not be defined since arm_neon is 0?
- 'PNG_ARM_NEON_OPT=0',
- ],
- }],
+ }, { # skia_os != "android"
+ 'dependencies': [
+ 'libpng.gyp:libpng_static',
],
- 'sources': [
- '../third_party/externals/libpng/png.c',
- '../third_party/externals/libpng/pngerror.c',
- '../third_party/externals/libpng/pngget.c',
- '../third_party/externals/libpng/pngmem.c',
- '../third_party/externals/libpng/pngpread.c',
- '../third_party/externals/libpng/pngread.c',
- '../third_party/externals/libpng/pngrio.c',
- '../third_party/externals/libpng/pngrtran.c',
- '../third_party/externals/libpng/pngrutil.c',
- '../third_party/externals/libpng/pngset.c',
- '../third_party/externals/libpng/pngtrans.c',
- '../third_party/externals/libpng/pngwio.c',
- '../third_party/externals/libpng/pngwrite.c',
- '../third_party/externals/libpng/pngwtran.c',
- '../third_party/externals/libpng/pngwutil.c',
+ 'export_dependent_settings': [
+ 'libpng.gyp:libpng_static',
],
- }, { # not skia_libpng_static
- 'type': 'none',
- 'conditions': [
- [ 'skia_os == "android"',
- {
- # TODO(halcanary): merge all png targets into this file.
- 'dependencies': [
- 'android_deps.gyp:png',
- ],
- 'export_dependent_settings': [
- 'android_deps.gyp:png',
- ],
- }, { # skia_os != "android"
- 'dependencies': [
- 'zlib.gyp:zlib',
- ],
- 'export_dependent_settings': [
- 'zlib.gyp:zlib',
- ],
- 'direct_dependent_settings': {
- 'link_settings': {
- 'libraries': [
- '-lpng',
- ],
- },
- },
- }
- ]
- ]
}
]
+ ]
+ },
+ {
+ 'target_name': 'libpng_static',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'include_dirs': [
+ # Needed for generated pnglibconf.h
scroggo 2015/04/01 15:40:20 and pngprefix.h
djsollen 2015/04/01 17:19:01 Done.
+ '../third_party/libpng',
+ '../third_party/externals/libpng',
+ ],
+ 'dependencies': [
+ 'zlib.gyp:zlib',
+ ],
+ 'export_dependent_settings': [
+ 'zlib.gyp:zlib',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/externals/libpng',
+ # Needed for generated pnglibconf.h
scroggo 2015/04/01 15:40:20 and pngprefix.h
djsollen 2015/04/01 17:19:01 Done.
+ '../third_party/libpng',
+ ],
+ 'defines': [
+ 'SKIA_PNG_PREFIXED',
+ ],
+ },
+ 'cflags': [
+ '-w',
+ '-fvisibility=hidden',
+ ],
+ 'defines': [
scroggo 2015/04/01 15:40:20 spacing?
djsollen 2015/04/01 17:19:01 Done.
+ 'SKIA_PNG_PREFIXED',
+ ],
+ 'sources': [
+ '../third_party/externals/libpng/png.c',
+ '../third_party/externals/libpng/pngerror.c',
+ '../third_party/externals/libpng/pngget.c',
+ '../third_party/externals/libpng/pngmem.c',
+ '../third_party/externals/libpng/pngpread.c',
+ '../third_party/externals/libpng/pngread.c',
+ '../third_party/externals/libpng/pngrio.c',
+ '../third_party/externals/libpng/pngrtran.c',
+ '../third_party/externals/libpng/pngrutil.c',
+ '../third_party/externals/libpng/pngset.c',
+ '../third_party/externals/libpng/pngtrans.c',
+ '../third_party/externals/libpng/pngwio.c',
+ '../third_party/externals/libpng/pngwrite.c',
+ '../third_party/externals/libpng/pngwtran.c',
+ '../third_party/externals/libpng/pngwutil.c',
+ ],
+ 'conditions': [
+ ['arm_neon or arm_neon_optional', {
+ 'defines': [
+ 'PNG_ARM_NEON_OPT=2',
+ ],
+ 'sources': [
+ '../third_party/externals/libpng/arm/arm_init.c',
scroggo 2015/04/01 15:40:20 Maybe add a comment to the description that you're
djsollen 2015/04/01 17:19:01 Done.
+ '../third_party/externals/libpng/arm/filter_neon.S',
+ '../third_party/externals/libpng/arm/filter_neon_intrinsics.c',
+ ],
+ }, { # !neon
+ 'defines': [
+ # not sure if I need this
scroggo 2015/04/01 15:40:20 I assume this replaces my old FIXME?
djsollen 2015/04/01 17:19:01 Done.
scroggo 2015/04/01 17:20:48 No longer needed after all?
+ 'PNG_ARM_NEON_OPT=0',
+ ],
+ }],
],
},
]
« gyp/codec.gyp ('K') | « gyp/common_variables.gypi ('k') | src/codec/SkCodec_libpng.h » ('j') | src/codec/SkCodec_libpng.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698