Index: public.bzl |
diff --git a/public.bzl b/public.bzl |
index 5ba561231085bd349ae4ba4262c4882bc218abf7..f84abc0e6c9abca39049585ac77661f1fadd3d2c 100644 |
--- a/public.bzl |
+++ b/public.bzl |
@@ -79,9 +79,6 @@ |
"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. |
@@ -386,7 +383,6 @@ |
"src/utils", |
"third_party/etc1", |
"third_party/ktx", |
- "third_party/libpng", |
] |
################################################################################ |
@@ -551,17 +547,15 @@ |
################################################################################ |
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 = [ |
@@ -569,11 +563,8 @@ |
"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 = [ |