This makes the Skia build work 95% in GN and it fixes a number of err…

…or reporting bugs I found along the way.

BUG=
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/25360004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227057 0039d316-1c4b-4281-b951-d872f2087c98

tools/gn/config.cc

@@ -40,6 +40,7 @@ Config* Config::GetConfig(const Settings* settings,
   if (!node) {
     config = new Config(label);
     node = new ItemNode(config);
+    node->set_originally_referenced_from_here(specified_from_here);
     tree->AddNodeLocked(node);
 
     // Only schedule loading the given target if somebody is depending on it

tools/gn/functions_target.cc

@@ -43,6 +43,8 @@ Value ExecuteGenericTarget(const char* target_type,
 
   TargetGenerator::GenerateTarget(&block_scope, function->function(), args,
                                   target_type, err);
+  if (err->has_error())
+    return Value();
 
   block_scope.CheckForUnusedVars(err);
   return Value();

tools/gn/ninja_build_writer.cc

@@ -47,8 +47,15 @@ std::string GetSelfInvocationCommand(const BuildSettings* build_settings) {
 
   CommandLine cmdline(executable);
   cmdline.AppendSwitchPath("--root", build_settings->root_path());
-
-  // TODO(brettw) append other parameters.
+  cmdline.AppendSwitch("-q");  // Don't write output.
+
+  const CommandLine& our_cmdline = *CommandLine::ForCurrentProcess();
+  const CommandLine::SwitchMap& switches = our_cmdline.GetSwitches();
+  for (CommandLine::SwitchMap::const_iterator i = switches.begin();
+       i != switches.end(); ++i) {
+    if (i->first != "q" && i->first != "root")
+      cmdline.AppendSwitchNative(i->first, i->second);
+  }
 
 #if defined(OS_WIN)
   return WideToUTF8(cmdline.GetCommandLineString());

tools/gn/secondary/net/BUILD.gn

@@ -847,8 +847,6 @@ component("net") {
     "socket/stream_socket.h",
     "socket/tcp_client_socket.cc",
     "socket/tcp_client_socket.h",
-    "socket/tcp_client_socket_win.cc",
-    "socket/tcp_client_socket_win.h",
     "socket/tcp_listen_socket.cc",
     "socket/tcp_listen_socket.h",
     "socket/tcp_server_socket.cc",
@@ -1075,8 +1073,6 @@ component("net") {
   if (is_win) {
     sources -= [
       "http/http_auth_handler_ntlm_portable.cc",
-      "socket/tcp_client_socket_libevent.cc",
-      "socket/tcp_client_socket_libevent.h",
       "socket/tcp_socket_libevent.cc",
       "socket/tcp_socket_libevent.h",
       "ssl/client_cert_store_impl_nss.cc",