diff options
| author |  djsollen <djsollen@google.com> | 2015-04-01 10:33:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-01 10:33:55 -0700 |
| commit | 2469c999518e7b0063d35e9e2eb074a0477c21ac (patch) | |
| tree | ae5382d53caae360fe836ee859e5f9a17cb6bf34 /third_party/libpng/pnglibconf.h | |
| parent | 65a8e12287f40b1f3c3623397656f813b942b36f (diff) | |
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.
Review URL: https://codereview.chromium.org/1032253003
Diffstat (limited to 'third_party/libpng/pnglibconf.h')
| -rw-r--r-- | third_party/libpng/pnglibconf.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/third_party/libpng/pnglibconf.h b/third_party/libpng/pnglibconf.h index da3b229215..ea3694bf49 100644 --- a/third_party/libpng/pnglibconf.h +++ b/third_party/libpng/pnglibconf.h @@ -207,4 +207,11 @@ #define PNG_sCAL_PRECISION 5 #define PNG_sRGB_PROFILE_CHECKS 2 /* end of settings */ + +/* custom settings */ +#define PNG_ARM_NEON_API_SUPPORTED +#define PNG_ARM_NEON_CHECK_SUPPORTED +#define PNG_PREFIX skia_ +/* end of custom settings */ + #endif /* PNGLCONF_H */ |