diff options
| author |  scroggo <scroggo@google.com> | 2016-06-21 14:13:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-21 14:13:40 -0700 |
| commit | e6939c15dc0c09f1348988dc56e50b6bea27b7ce (patch) | |
| tree | cbce01e2c6d1da0b98d972b3604f54cfd5d756aa /public.bzl | |
| parent | b3105190a6e02d37f1d7f07a3a8bdd368ec7f157 (diff) | |
Bring back compiling third_party/libpng in public.bzl
Disable the optimizations for simplicity, as suggested in [1].
Remove PNG_SKIP_SETJMP_CHECK, which is not defined in version 1.6.22.
[1] https://codereview.chromium.org/2033063003/diff/20001/public.bzl#newcode84
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2044703006
Review-Url: https://codereview.chromium.org/2044703006
Diffstat (limited to 'public.bzl')
| -rw-r--r-- | public.bzl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/public.bzl b/public.bzl index f84abc0e6c..5ba5612310 100644 --- a/public.bzl +++ b/public.bzl @@ -79,6 +79,9 @@ BASE_SRCS_ALL = struct( "third_party/etc1/*.h", "third_party/ktx/*.cpp", "third_party/ktx/*.h", + + "third_party/libpng/*.c", + "third_party/libpng/*.h", ], exclude = PRIVATE_HDRS_LIST + [ # Exclude platform-dependent files. @@ -383,6 +386,7 @@ INCLUDES = [ "src/utils", "third_party/etc1", "third_party/ktx", + "third_party/libpng", ] ################################################################################ @@ -547,15 +551,17 @@ COPTS_ALL = [] ################################################################################ DEFINES_UNIX = [ - "PNG_SKIP_SETJMP_CHECK", "SK_BUILD_FOR_UNIX", "SK_SAMPLES_FOR_X", "SK_SFNTLY_SUBSETTER", "SK_CODEC_DECODES_RAW", "SK_HAS_GIF_LIBRARY", "SK_HAS_JPEG_LIBRARY", - "SK_HAS_PNG_LIBRARY", "SK_HAS_WEBP_LIBRARY", + "SK_HAS_PNG_LIBRARY", + "PNG_ARM_NEON_OPT=0", + "PNG_INTEL_SSE_OPT=0", + "PNG_ARM_NEON_IMPLEMENTATION=0", ] DEFINES_ANDROID = [ @@ -563,8 +569,11 @@ DEFINES_ANDROID = [ "SK_CODEC_DECODES_RAW", "SK_HAS_GIF_LIBRARY", "SK_HAS_JPEG_LIBRARY", - "SK_HAS_PNG_LIBRARY", "SK_HAS_WEBP_LIBRARY", + "SK_HAS_PNG_LIBRARY", + "PNG_ARM_NEON_OPT=0", + "PNG_INTEL_SSE_OPT=0", + "PNG_ARM_NEON_IMPLEMENTATION=0", ] DEFINES_IOS = [ |