Revert of Enable both static and dynamically linked libpng (patchset #4 id:60001 of https://codereview.chromium.org/1032253003/)
Reason for revert:
breaking the nexus_9 and ios builds.
Original issue's description:
> Enable both static and dynamically linked libpng
>
> All platforms except android are configured to use the statically linked copy of libpng. Android uses the system provided dynamic copy for SkImageDecoder and the static copy for SkCodec. The exception being android framework builds that currently use the dynamic copy everywhere.
>
> This CL also enables NEON optimizations for libpng.
>
> Committed: https://skia.googlesource.com/skia/+/2469c999518e7b0063d35e9e2eb074a0477c21ac
TBR=scroggo@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1050183002
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 1373773..eb49f6c 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,6 +18,7 @@
'dependencies': [
'core.gyp:*',
'giflib.gyp:giflib',
+ 'libpng.gyp:libpng',
],
'cflags':[
# FIXME: This gets around a longjmp warning. See
@@ -46,21 +47,6 @@
'../include/codec',
],
},
- 'conditions': [
- [ 'skia_android_framework == 1',
- {
- # TODO(djsollen): this is a temporary dependency until we can update
- # the android framework to a more recent version of libpng.
- 'dependencies': [
- 'libpng.gyp:libpng',
- ],
- }, { # !skia_android_framework
- 'dependencies': [
- 'libpng.gyp:libpng_static',
- ],
- }
- ]
- ]
},
],
}
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 8fb4620..80ab7c9 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -165,6 +165,15 @@
}, {
'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',
}],
+ [ 'skia_os == "android"', {
+ # skia_libpng_static - instead of linking libpng with '-lpng' and
+ # including the headers from '/usr/include/png.h', compile and
+ # statically link the version of libpng in
+ # third_party/externals/libpng.
+ 'skia_libpng_static%': '0',
+ }, {
+ 'skia_libpng_static%': '1',
+ }],
[ 'skia_sanitizer', {
'skia_clang_build': 1,
'skia_keep_frame_pointer': 1,
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp
index 9f90098..1ca6eef 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -10,84 +10,90 @@
'targets': [
{
'target_name': 'libpng',
- 'type': 'none',
'conditions': [
- [ 'skia_os == "android"',
+ [ 'skia_libpng_static',
{
+ 'type': 'static_library',
+ 'include_dirs': [
+ '../third_party/externals/libpng',
+ # Needed for generated pnglibconf.h
+ '../third_party/libpng',
+ ],
'dependencies': [
- 'android_deps.gyp:png',
+ 'zlib.gyp:zlib',
],
'export_dependent_settings': [
- 'android_deps.gyp:png',
+ 'zlib.gyp:zlib',
],
- }, { # skia_os != "android"
- 'dependencies': [
- 'libpng.gyp:libpng_static',
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/externals/libpng',
+ # Needed for generated pnglibconf.h
+ '../third_party/libpng',
+ ],
+ },
+ 'cflags': [
+ '-w',
+ '-fvisibility=hidden',
],
- 'export_dependent_settings': [
- 'libpng.gyp:libpng_static',
+ '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',
+ ],
+ }],
],
+ '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',
+ ],
+ }, { # 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 and pngprefix.h
- '../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 and pngprefix.h
- '../third_party/libpng',
- ],
- 'defines': [
- 'SKIA_PNG_PREFIXED',
- ],
- },
- 'cflags': [
- '-w',
- '-fvisibility=hidden',
- ],
- 'defines': [
- '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', {
- 'sources': [
- '../third_party/externals/libpng/arm/arm_init.c',
- '../third_party/externals/libpng/arm/filter_neon.S',
- '../third_party/externals/libpng/arm/filter_neon_intrinsics.c',
- ],
- }],
],
},
]