Enabling Skia / Moterm to build with PNaCl Newlib toolchain

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")
 import("//testing/test.gni")
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
@@ skipping 375 matching lines @@
       "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }
   if (!is_mac && !is_ios) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
   # 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",
     ]
   }
 
   # Select the right BitmapPlatformDevice.
   if (is_mac || is_ios) {
     sources += [
       "ext/bitmap_platform_device_mac.cc",
@@ skipping 20 matching lines @@
   ]
   public_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//third_party/zlib",
   ]
 
-  if (is_linux) {
+  if (is_linux || is_nacl) {
     deps += [
       "//third_party/freetype2",
       "//third_party/icu:icuuc",
     ]
   }
 
   if (is_android) {
     set_sources_assignment_filter([])
     sources += [ "ext/platform_device_linux.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
@@ skipping 40 matching lines @@
     } else {
       sources = gypi_skia_opts.none_sources
     }
   } else if (current_cpu == "arm64") {
     # TODO(1841): NEON sources are not currently used on arm64.
     sources = gypi_skia_opts.none_sources
   } else if (current_cpu == "mipsel") {
     cflags += [ "-fomit-frame-pointer" ]
 
     sources = gypi_skia_opts.none_sources
+  } else if (current_cpu == "pnacl") {
+    cflags += [ "-fomit-frame-pointer" ]

[Mark Seaborn, 2015/12/16 21:20:37]

Why this option?  I'm certain you don't need it because it has no significance
when building bitcode.

[Sean Klein, 2015/12/16 22:34:03]

Removed. I naively figured it would improve performance, but I suppose it would
only be relevant at translation time.

+    sources = gypi_skia_opts.none_sources
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
@@ skipping 26 matching lines @@
   deps = [
     ":skia",
     "//base",
     "//base/test:run_all_unittests",
     "//cc:test_support",  # TODO: Fix this test to not depend on cc.
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }