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..770023b9630c9934f1b68619c65c78a3fa9f6f44 100644
--- a/apps/BUILD.gn
+++ b/apps/BUILD.gn
@@ -2,18 +2,33 @@
 # 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")
+
+# Collection of apps which are currently capable of being built as pexes.
+group("portable_apps") {
   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) {
+    deps += [ ":portable_apps(//build/toolchain/nacl:newlib_pnacl)" ]
+  }
 }