Enabling Skia / Moterm to build with PNaCl Newlib toolchain

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 65f1dbd594d927f3ab8d823bf077066eb0787abb..12ced6b5a838ec7777044d60a2b71988a7a1e907 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -393,14 +393,14 @@ component("skia") {
 
   # On "Linux" (i.e., not Android), we use our a custom SkFontMgr.
   # TODO(vtl): We should probably do the same on Android.
-  if (is_linux) {
+  if (is_linux || is_nacl) {
     sources += [
       "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
       "ports/font_mgr_factory.cc",
     ]
   }
 
-  if (!is_linux && !is_android) {
+  if (!is_linux && !is_android && !is_nacl) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
@@ -441,7 +441,7 @@ component("skia") {
     "//third_party/zlib",
   ]
 
-  if (is_linux) {
+  if (is_linux || is_nacl) {
     deps += [
       "//third_party/freetype2",
       "//third_party/icu:icuuc",
@@ -502,6 +502,8 @@ source_set("skia_opts") {
     cflags += [ "-fomit-frame-pointer" ]
 
     sources = gypi_skia_opts.none_sources
+  } else if (current_cpu == "pnacl") {
+    sources = gypi_skia_opts.none_sources
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }