roll up of misc. gn work

mojo/nacl/BUILD.gn

Index: mojo/nacl/BUILD.gn
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index 3ce017d44c0cca6eb33e44cdfa62bff98430ec9f..137540bbd0b22f80b8eb01c2015773711659e548 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -21,6 +21,7 @@ if (current_toolchain == default_toolchain) {
       "$gen_dir/mojo_syscall.cc",
       "$gen_dir/libmojo.cc",
     ]
+    public_configs = [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ]
   }
 }
 
@@ -33,6 +34,7 @@ if (!is_nacl) {
       "$gen_dir/mojo_syscall.cc",
       "monacl_sel_main.cc",
     ]
+
     deps = [
       # This target makes sure we have all the pre-processor defines needed to
       # use NaCl's headers.
@@ -65,7 +67,7 @@ if (is_nacl) {
     sources = [
       "$gen_dir/libmojo.cc",
     ]
-    deps = [
+    public_deps = [
       ":mojo_nacl_codegen($default_toolchain)",
     ]
   }
@@ -77,6 +79,7 @@ if (is_nacl) {
       "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc",
       "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc",
     ]
+    include_dirs = [ "//third_party/mojo/src" ]
     deps = [
       "//native_client/src/untrusted/nacl:imc_syscalls",
       "//testing/gtest:gtest",