Bring back compiling third_party/libpng in public.bzl

public.bzl

 ################################################################################
 # Skylark macros
 ################################################################################
 
 is_bazel = not hasattr(native, "genmpm")
 
 def portable_select(select_dict, bazel_condition, default_condition):
   """Replaces select() with a Bazel-friendly wrapper.
 
   Args:
@@ skipping 61 matching lines @@
 BASE_SRCS_ALL = struct(
     include = [
         "src/**/*.h",
         "src/**/*.cpp",
 
         # Third Party
         "third_party/etc1/*.cpp",
         "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.
         "src/android/*",
         "src/codec/*",
         "src/device/xps/*",  # Windows-only. Move to ports?
         "src/doc/*_XPS.cpp",  # Windows-only. Move to ports?
         "src/fonts/SkFontMgr_fontconfig.cpp",
         "src/gpu/gl/android/*",
         "src/gpu/gl/egl/*",
@@ skipping 284 matching lines @@
     "src/gpu",
     "src/image",
     "src/lazy",
     "src/opts",
     "src/ports",
     "src/pdf",
     "src/sfnt",
     "src/utils",
     "third_party/etc1",
     "third_party/ktx",
+    "third_party/libpng",
 ]
 
 ################################################################################
 ## DM_SRCS
 ################################################################################
 
 DM_SRCS_ALL = struct(
     include = [
         "dm/*.cpp",
         "dm/*.h",
@@ skipping 144 matching lines @@
 
 COPTS_IOS = []
 
 COPTS_ALL = []
 
 ################################################################################
 ## DEFINES
 ################################################################################
 
 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",
 ]
 
 DEFINES_ANDROID = [
     "SK_BUILD_FOR_ANDROID",
     "SK_CODEC_DECODES_RAW",
     "SK_HAS_GIF_LIBRARY",
     "SK_HAS_JPEG_LIBRARY",
-    "SK_HAS_PNG_LIBRARY",
     "SK_HAS_WEBP_LIBRARY",
 ]
 
 DEFINES_IOS = [
     "SK_BUILD_FOR_IOS",
     "SK_BUILD_NO_OPTS",
     "SK_IGNORE_ETC1_SUPPORT",
     "SKNX_NO_SIMD",
 ]
 
 DEFINES_ALL = [
     # Chrome DEFINES.
     "SK_USE_FLOATBITS",
     "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",
     "SK_SUPPORT_LEGACY_IMAGEFILTER_PTR",
     "SK_SUPPORT_LEGACY_MINOR_EFFECT_PTR",
     "SK_SUPPORT_LEGACY_NEW_SURFACE_API",
     "SK_SUPPORT_LEGACY_PATHEFFECT_PTR",
     "SK_SUPPORT_LEGACY_PICTURE_PTR",
     "SK_SUPPORT_LEGACY_MASKFILTER_PTR",
     "SK_SUPPORT_LEGACY_IMAGEFACTORY",
     "SK_SUPPORT_LEGACY_XFERMODE_PTR",
     "SK_SUPPORT_LEGACY_TYPEFACE_PTR",
 ]
 
 ################################################################################
 ## LINKOPTS
 ################################################################################
 
 LINKOPTS_UNIX = []
 
 LINKOPTS_ANDROID = [
     "-lEGL",
 ]
 
 LINKOPTS_IOS = []
 
 LINKOPTS_ALL = [
     "-ldl",
 ]