Enabling Skia / Moterm to build with PNaCl Newlib toolchain

apps/BUILD.gn

Index: apps/BUILD.gn
diff --git a/apps/BUILD.gn b/apps/BUILD.gn
index d5585a8abf0033774996db87f49d9164be9bba1f..8691ffd0740416c61e54f027112b3358341673c6 100644
--- a/apps/BUILD.gn
+++ b/apps/BUILD.gn
@@ -2,18 +2,32 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-group("apps") {
+import("//build/config/nacl/config.gni")
+
+group("portable_apps") {

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

Maybe add a comment to explain that "portable" means "builds OK with PNaCl"?

The other file has the comment "# Collection of examples which are currently
capable of being built as pexes."

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

Done.

   testonly = true
 
   deps = [
-    "//apps/benchmark",
-    "//apps/benchmark:apptests",
     "//apps/moterm",
     "//apps/moterm:apptests",
     "//apps/moterm:gl_helper_test_app",
   ]
+}
+
+group("apps") {
+  testonly = true
+
+  deps = [
+    ":portable_apps",
+    "//apps/benchmark",
+    "//apps/benchmark:apptests",
+  ]
 
   if (is_android) {
     deps += [ "//apps/shortcut" ]
   }
+
+  if (mojo_use_nacl && (is_linux || is_android) && !is_asan) {

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

Can you drop "&& (is_linux || is_android) && !is_asan", given that mojo_use_nacl
implies those?

That's based on the definitions in build/config/nacl/config.gni:
  mojo_use_nacl_sfi = is_linux && !is_asan && !is_fnl
  mojo_use_nacl_nonsfi = (is_linux || is_android) && !is_asan && !is_fnl
  mojo_use_nacl = mojo_use_nacl_sfi || mojo_use_nacl_nonsfi

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

Done.

+    deps += [ ":portable_apps(//build/toolchain/nacl:newlib_pnacl)" ]
+  }
 }