Allow directories for GN data lists.

tools/gn/runtime_deps.cc

 // Copyright 2015 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.
 
 #include "tools/gn/runtime_deps.h"
 
 #include <set>
 #include <sstream>
 
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 // the found_files list. Updates the list.
 void AddIfNew(const OutputFile& output_file,
               const Target* source,
               RuntimeDepsVector* deps,
               std::set<OutputFile>* found_file) {
   if (found_file->find(output_file) != found_file->end())
     return;  // Already there.
   deps->push_back(std::make_pair(output_file, source));
 }
 
-// Automatically converts a SourceFile to an OutputFile.
-void AddIfNew(const SourceFile& source_file,
+// Automatically converts a string that looks like a source to an OutputFile.
+void AddIfNew(const std::string& str,
               const Target* source,
               RuntimeDepsVector* deps,
               std::set<OutputFile>* found_file) {
-  AddIfNew(OutputFile(source->settings()->build_settings(), source_file),
-           source, deps, found_file);
+  OutputFile output_file(RebasePath(
+      str,
+      source->settings()->build_settings()->build_dir(),
+      source->settings()->build_settings()->root_path_utf8()));
+  AddIfNew(output_file, source, deps, found_file);
 }
 
 // Returns the output file that the runtime deps considers for the given
 // targets. This is weird only for shared libraries.
 const OutputFile& GetMainOutput(const Target* target) {
   if (target->output_type() == Target::SHARED_LIBRARY)
     return target->link_output_file();
   return target->dependency_output_file();
 }
 
@@ skipping 19 matching lines @@
     AddIfNew(file, target, deps, found_files);
 
   // Actions/copy have all outputs considered when the're a data dep.
   if (is_target_data_dep &&
       (target->output_type() == Target::ACTION ||
        target->output_type() == Target::ACTION_FOREACH ||
        target->output_type() == Target::COPY_FILES)) {
     std::vector<SourceFile> outputs;
     target->action_values().GetOutputsAsSourceFiles(target, &outputs);
     for (const auto& output_file : outputs)
-      AddIfNew(output_file, target, deps, found_files);
+      AddIfNew(output_file.value(), target, deps, found_files);
   }
 
   // Non-data dependencies (both public and private).
   for (const auto& dep_pair : target->GetDeps(Target::DEPS_LINKED)) {
     if (dep_pair.ptr->output_type() == Target::EXECUTABLE)
       continue;  // Skip executables that aren't data deps.
     RecursiveCollectRuntimeDeps(dep_pair.ptr, false,
                                 deps, seen_targets, found_files);
   }
 
@@ skipping 29 matching lines @@
 
 const char kRuntimeDeps_Help[] =
     "Runtime dependencies\n"
     "\n"
     "  Runtime dependencies of a target are exposed via the \"runtime_deps\"\n"
     "  category of \"gn desc\" (see \"gn help desc\") or they can be written\n"
     "  at build generation time via \"--runtime-deps-list-file\"\n"
     "  (see \"gn help --runtime-deps-list-file\").\n"
     "\n"
     "  To a first approximation, the runtime dependencies of a target are\n"
-    "  the set of \"data\" files and the shared libraries from all transitive\n"
-    "  dependencies. Executables and shared libraries are considered runtime\n"
-    "  dependencies of themselves.\n"
+    "  the set of \"data\" files, data directories, and the shared libraries\n"
+    "  from all transitive dependencies. Executables and shared libraries are\n"
+    "  considered runtime dependencies of themselves.\n"
     "\n"
     "Details\n"
     "\n"
     "  Executable targets and those executable targets' transitive\n"
     "  dependencies are not considered unless that executable is listed in\n"
     "  \"data_deps\". Otherwise, GN assumes that the executable (and\n"
     "  everything it requires) is a build-time dependency only.\n"
     "\n"
     "  Action and copy targets that are listed as \"data_deps\" will have all\n"
     "  of their outputs and data files considered as runtime dependencies.\n"
@@ skipping 70 matching lines @@
       return false;
     }
 
     // Currently this writes all runtime deps files sequentially. We generally
     // expect few of these. We can run this on the worker pool if it looks
     // like it's talking a long time.
     WriteRuntimeDepsFile(target);
   }
   return true;
 }