Work on Mac GN build

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 56 matching lines @@
   }
 
   if (is_android) {
     defines += [
       "SK_BUILD_FOR_ANDROID",
       "USE_CHROMIUM_SKIA",
     ]
   }
 }
 
-config("skia_dependent_config") {
-}
-
 # Internal-facing config for Skia library code.
 config("skia_library_config") {
+  # These include directories are only included for Skia code and are not
+  # exported to dependents. It's not clear if this is on purpose, but this
+  # matches the GYP build.
+  include_dirs = []
+  if (is_mac || is_ios) {
+    include_dirs += [ "//third_party/skia/include/utils/mac" ]
+  }
+  if (is_mac) {
+    include_dirs += [ "//third_party/skia/include/utils/ios" ]
+  }
+
   defines = [
     #skia_export_defines ???) TODO
 
     # skia uses static initializers to initialize the serialization logic
     # of its "pictures" library. This is currently not used in chrome; if
     # it ever gets used the processes that use it need to call
     # SkGraphics::Init().
     "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0",
 
     # Disable this check because it is too strict for some Chromium-specific
@@ skipping 151 matching lines @@
       "ext/vector_platform_device_skia.cc"
     ]
   }
 
   # Fixup skia library sources.
   if (is_win) {
     sources -= [
       "//third_party/skia/src/ports/SkOSFile_posix.cpp",
       "//third_party/skia/src/ports/SkTime_Unix.cpp",
       "//third_party/skia/src/ports/SkTLS_pthread.cpp",
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
     ]
   } else {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
       "//third_party/skia/src/ports/SkFontHost_win_dw.cpp",
       "//third_party/skia/src/ports/SkFontMgr_default_gdi.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
     ]
   }
   if (!is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface_android.cpp",
       "//third_party/skia/src/ports/SkFontConfigParser_android.cpp",
     ]
   }
   if (!is_mac) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_mac.cpp",
       "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
     ]
   }
   if (!is_linux) {
     sources -= [
+      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
+      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontHost_linux.cpp",
       "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
     ]
   } else if (!is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
     ]
   }
   if (!is_posix) {
     sources -= [
       "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
     ]
   }
 
   if (!use_cairo) {
     sources -= [
       "ext/bitmap_platform_device_cairo.cc",
       "ext/bitmap_platform_device_cairo.h",
     ]
   }
 
+  if (is_clang) {
+    # Skia won't compile with some of the more strict clang warnings.
+    # e.g. it does:
+    #  SkASSERT(!"sk_out_of_memory");

[Nico, 2014/07/10 20:39:31]

They had fixed all these a while ago when I asked them to. They try to build
with "regular" warnings as far as I know. If that doesn't work in gn for some
reason, consider pinging mtklein or bungeman about it and they'll likely fix it
quickly.

+    configs -= [ "//build/config/clang:extra_warnings" ]
+  }
+
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code"
   ]
   direct_dependent_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
@@ skipping 52 matching lines @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   # TODO(brettw) uncomment when visibility is supported.
   #visibility = ":skia"
 }