GN: fixes for Mac

 - Make fiddle build on Mac (skipping GL).
 - Now that we're building in SkCodec, we depend on libpng and libjpeg-turbo unconditionally, not just on Linux.
 - Re-arrange third_party a bit so that our targets are Fuchsia/Chrome compatible.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184133002

NOTREECHECKS=true
This doesn't affect Chrome/Blink, so landing through the closed tree.

Review-Url: https://codereview.chromium.org/2184133002

3 files changed, 99 insertions, 83 deletions

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 1aca3ca9cb..49d9f568c4 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -6,89 +6,6 @@
 declare_args() {
 }
 
-import("third_party.gni")
-
-config("libpng_public") {
-  include_dirs = [ "libpng" ]
-}
-third_party("libpng") {
-  public_configs = [ ":libpng_public" ]
-
-  deps = [
-    "//third_party/zlib",
-  ]
-  sources = [
-    "libpng/png.c",
-    "libpng/pngerror.c",
-    "libpng/pngget.c",
-    "libpng/pngmem.c",
-    "libpng/pngpread.c",
-    "libpng/pngread.c",
-    "libpng/pngrio.c",
-    "libpng/pngrtran.c",
-    "libpng/pngrutil.c",
-    "libpng/pngset.c",
-    "libpng/pngtrans.c",
-    "libpng/pngwio.c",
-    "libpng/pngwrite.c",
-    "libpng/pngwtran.c",
-    "libpng/pngwutil.c",
-  ]
-}
-
-config("libjpeg-turbo_config") {
-  include_dirs = [ "externals/libjpeg-turbo" ]
-}
-third_party("libjpeg-turbo") {
-  public_configs = [ ":libjpeg-turbo_config" ]
-
-  sources = [
-    "externals/libjpeg-turbo/jcapimin.c",
-    "externals/libjpeg-turbo/jcapistd.c",
-    "externals/libjpeg-turbo/jccoefct.c",
-    "externals/libjpeg-turbo/jccolor.c",
-    "externals/libjpeg-turbo/jcdctmgr.c",
-    "externals/libjpeg-turbo/jchuff.c",
-    "externals/libjpeg-turbo/jcinit.c",
-    "externals/libjpeg-turbo/jcmainct.c",
-    "externals/libjpeg-turbo/jcmarker.c",
-    "externals/libjpeg-turbo/jcmaster.c",
-    "externals/libjpeg-turbo/jcomapi.c",
-    "externals/libjpeg-turbo/jcparam.c",
-    "externals/libjpeg-turbo/jcphuff.c",
-    "externals/libjpeg-turbo/jcprepct.c",
-    "externals/libjpeg-turbo/jcsample.c",
-    "externals/libjpeg-turbo/jdapimin.c",
-    "externals/libjpeg-turbo/jdapistd.c",
-    "externals/libjpeg-turbo/jdcoefct.c",
-    "externals/libjpeg-turbo/jdcolor.c",
-    "externals/libjpeg-turbo/jddctmgr.c",
-    "externals/libjpeg-turbo/jdhuff.c",
-    "externals/libjpeg-turbo/jdinput.c",
-    "externals/libjpeg-turbo/jdmainct.c",
-    "externals/libjpeg-turbo/jdmarker.c",
-    "externals/libjpeg-turbo/jdmaster.c",
-    "externals/libjpeg-turbo/jdmerge.c",
-    "externals/libjpeg-turbo/jdphuff.c",
-    "externals/libjpeg-turbo/jdpostct.c",
-    "externals/libjpeg-turbo/jdsample.c",
-    "externals/libjpeg-turbo/jerror.c",
-    "externals/libjpeg-turbo/jfdctflt.c",
-    "externals/libjpeg-turbo/jfdctfst.c",
-    "externals/libjpeg-turbo/jfdctint.c",
-    "externals/libjpeg-turbo/jidctflt.c",
-    "externals/libjpeg-turbo/jidctfst.c",
-    "externals/libjpeg-turbo/jidctint.c",
-    "externals/libjpeg-turbo/jidctred.c",
-    "externals/libjpeg-turbo/jmemmgr.c",
-    "externals/libjpeg-turbo/jmemnobs.c",
-    "externals/libjpeg-turbo/jquant1.c",
-    "externals/libjpeg-turbo/jquant2.c",
-    "externals/libjpeg-turbo/jsimd_none.c",
-    "externals/libjpeg-turbo/jutils.c",
-  ]
-}
-
 config("system_freetype2") {
   include_dirs = [ "/usr/include/freetype2" ]
   libs = [ "freetype" ]
diff --git a/third_party/libjpeg_turbo/BUILD.gn b/third_party/libjpeg_turbo/BUILD.gn
new file mode 100644
index 0000000000..f03bca70d5
--- /dev/null
+++ b/third_party/libjpeg_turbo/BUILD.gn
@@ -0,0 +1,62 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+}
+
+import("../third_party.gni")
+
+config("libjpeg_turbo_config") {
+  include_dirs = [ "../externals/libjpeg-turbo" ]
+}
+third_party("libjpeg_turbo") {
+  public_configs = [ ":libjpeg_turbo_config" ]
+
+  sources = [
+    "../externals/libjpeg-turbo/jcapimin.c",
+    "../externals/libjpeg-turbo/jcapistd.c",
+    "../externals/libjpeg-turbo/jccoefct.c",
+    "../externals/libjpeg-turbo/jccolor.c",
+    "../externals/libjpeg-turbo/jcdctmgr.c",
+    "../externals/libjpeg-turbo/jchuff.c",
+    "../externals/libjpeg-turbo/jcinit.c",
+    "../externals/libjpeg-turbo/jcmainct.c",
+    "../externals/libjpeg-turbo/jcmarker.c",
+    "../externals/libjpeg-turbo/jcmaster.c",
+    "../externals/libjpeg-turbo/jcomapi.c",
+    "../externals/libjpeg-turbo/jcparam.c",
+    "../externals/libjpeg-turbo/jcphuff.c",
+    "../externals/libjpeg-turbo/jcprepct.c",
+    "../externals/libjpeg-turbo/jcsample.c",
+    "../externals/libjpeg-turbo/jdapimin.c",
+    "../externals/libjpeg-turbo/jdapistd.c",
+    "../externals/libjpeg-turbo/jdcoefct.c",
+    "../externals/libjpeg-turbo/jdcolor.c",
+    "../externals/libjpeg-turbo/jddctmgr.c",
+    "../externals/libjpeg-turbo/jdhuff.c",
+    "../externals/libjpeg-turbo/jdinput.c",
+    "../externals/libjpeg-turbo/jdmainct.c",
+    "../externals/libjpeg-turbo/jdmarker.c",
+    "../externals/libjpeg-turbo/jdmaster.c",
+    "../externals/libjpeg-turbo/jdmerge.c",
+    "../externals/libjpeg-turbo/jdphuff.c",
+    "../externals/libjpeg-turbo/jdpostct.c",
+    "../externals/libjpeg-turbo/jdsample.c",
+    "../externals/libjpeg-turbo/jerror.c",
+    "../externals/libjpeg-turbo/jfdctflt.c",
+    "../externals/libjpeg-turbo/jfdctfst.c",
+    "../externals/libjpeg-turbo/jfdctint.c",
+    "../externals/libjpeg-turbo/jidctflt.c",
+    "../externals/libjpeg-turbo/jidctfst.c",
+    "../externals/libjpeg-turbo/jidctint.c",
+    "../externals/libjpeg-turbo/jidctred.c",
+    "../externals/libjpeg-turbo/jmemmgr.c",
+    "../externals/libjpeg-turbo/jmemnobs.c",
+    "../externals/libjpeg-turbo/jquant1.c",
+    "../externals/libjpeg-turbo/jquant2.c",
+    "../externals/libjpeg-turbo/jsimd_none.c",
+    "../externals/libjpeg-turbo/jutils.c",
+  ]
+}
diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn
new file mode 100644
index 0000000000..fd80aad3b9
--- /dev/null
+++ b/third_party/libpng/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright 2016 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+}
+
+import("../third_party.gni")
+
+config("libpng_public") {
+  include_dirs = [ "." ]
+}
+third_party("libpng") {
+  public_configs = [ ":libpng_public" ]
+
+  deps = [
+    "//third_party/zlib",
+  ]
+  sources = [
+    "png.c",
+    "pngerror.c",
+    "pngget.c",
+    "pngmem.c",
+    "pngpread.c",
+    "pngread.c",
+    "pngrio.c",
+    "pngrtran.c",
+    "pngrutil.c",
+    "pngset.c",
+    "pngtrans.c",
+    "pngwio.c",
+    "pngwrite.c",
+    "pngwtran.c",
+    "pngwutil.c",
+  ]
+}