Make SkJpegCodec compatible with libjpeg

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 111 matching lines @@
         "src/android/*",
         "src/codec/*",
         "src/fonts/SkFontMgr_fontconfig.cpp",
         "src/images/*",
         "src/opts/**/*.cpp",
         "src/opts/**/*.h",
         "src/ports/**/*.cpp",
         "src/ports/**/*.h",
     ],
     exclude = [
-        "src/codec/SkJpegCodec.cpp",  # libjpeg_turbo version mismatch.
         # TODO(benjaminwagner): Can this be enabled?
         "src/codec/SkRaw*",
         "src/opts/*arm*",
         "src/opts/*mips*",
         "src/opts/*NEON*",
         "src/opts/*neon*",
         # Included in :opts_ssse3 library.
         "src/opts/*SSSE3*",
         "src/opts/*ssse3*",
         # Included in :opts_sse4 library.
@@ skipping 30 matching lines @@
         "src/android/*",
         "src/codec/*",
         "src/images/*",
         # TODO(benjaminwagner): Figure out how to compile with EGL.
         "src/opts/**/*.cpp",
         "src/opts/**/*.h",
         "src/ports/**/*.cpp",
         "src/ports/**/*.h",
     ],
     exclude = [
-        "src/codec/SkJpegCodec.cpp",  # libjpeg_turbo version mismatch.
         # TODO(benjaminwagner): Can this be enabled?
         "src/codec/SkRaw*",
         "src/opts/*mips*",
         "src/opts/*SSE2*",
         "src/opts/*SSSE3*",
         "src/opts/*ssse3*",
         "src/opts/*SSE4*",
         "src/opts/*sse4*",
         "src/opts/*avx*",
         "src/opts/*x86*",
@@ skipping 280 matching lines @@
 
 COPTS_IOS = []
 
 COPTS_ALL = []
 
 ################################################################################
 ## DEFINES
 ################################################################################
 
 DEFINES_UNIX = [
     "SK_BUILD_FOR_UNIX",

[dogben, 2016/02/11 01:59:58]

I patched this CL in and found out that you need to add PNG_SKIP_SETJMP_CHECK
here.

diff --git a/public.bzl b/public.bzl
index 33e5f15..98f6ef6 100644
--- a/public.bzl
+++ b/public.bzl
@@ -479,6 +479,7 @@ COPTS_ALL = []

################################################################################

 DEFINES_UNIX = [
+    "PNG_SKIP_SETJMP_CHECK",
     "SK_BUILD_FOR_UNIX",
     "SK_SAMPLES_FOR_X",
     "SK_SFNTLY_SUBSETTER",

[msarett, 2016/02/11 13:42:08]

Done.

     "SK_SAMPLES_FOR_X",
     "SK_SFNTLY_SUBSETTER",
 ]
 
 DEFINES_ANDROID = [
     "SK_BUILD_FOR_ANDROID",
     # TODO(benjaminwagner): Try to get png library updated?
     "SK_PNG_NO_INDEX_SUPPORTED",
 ]
 
@@ skipping 19 matching lines @@
 
 LINKOPTS_ANDROID = [
     "-lEGL",
 ]
 
 LINKOPTS_IOS = []
 
 LINKOPTS_ALL = [
     "-ldl",
 ]