Bring back compiling third_party/libpng in public.bzl

public.bzl

Index: public.bzl
diff --git a/public.bzl b/public.bzl
index f84abc0e6c9abca39049585ac77661f1fadd3d2c..2636ca49cd6da9641bd848dd00c4bc09b0074a13 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",

[dogben, 2016/06/09 12:27:18]

These files are not synced to Google3. I will reply via email on the changes you
would need to make.

[dogben, 2016/06/09 12:35:20]

I responded in internal cl/124383007.

[scroggo, 2016/06/21 20:09:42]

I think that is resolved by that CL and cl/125465882.

+        "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,14 +551,12 @@ 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",
 ]
 
@@ -563,7 +565,6 @@ DEFINES_ANDROID = [
     "SK_CODEC_DECODES_RAW",
     "SK_HAS_GIF_LIBRARY",
     "SK_HAS_JPEG_LIBRARY",
-    "SK_HAS_PNG_LIBRARY",
     "SK_HAS_WEBP_LIBRARY",
 ]
 
@@ -580,6 +581,11 @@ DEFINES_ALL = [
     "SK_USE_FREETYPE_EMBOLDEN",
     # Turn on a few Google3-specific build fixes.
     "GOOGLE3",
+    # Build our version of libpng

[dogben, 2016/06/09 12:38:02]

I don't know if these defines will work for the iOS build. You might want to
coordinate with luizp to make sure things will still work after this change.

[scroggo, 2016/06/21 20:09:42]

I'll leave PNG out of iOS for now, so it will be the same as before.

+    "SK_HAS_PNG_LIBRARY",
+    "PNG_ARM_NEON_OPT=0",
+    "PNG_INTEL_SSE_OPT=0",
+    "PNG_ARM_NEON_IMPLEMENTATION=0",
     # Staging flags for API changes
     "SK_SUPPORT_LEGACY_COLORFILTER_PTR",
     "SK_SUPPORT_LEGACY_CREATESHADER_PTR",