Propagate GN public shared libraries through shared libraries

tools/gn/target.h

 // Copyright (c) 2013 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.
 
 #ifndef TOOLS_GN_TARGET_H_
 #define TOOLS_GN_TARGET_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "tools/gn/action_values.h"
 #include "tools/gn/config_values.h"
+#include "tools/gn/inherited_libraries.h"
 #include "tools/gn/item.h"
 #include "tools/gn/label_ptr.h"
 #include "tools/gn/ordered_set.h"
 #include "tools/gn/output_file.h"
 #include "tools/gn/source_file.h"
 #include "tools/gn/unique_vector.h"
 
 class DepsIteratorRange;
 class InputFile;
 class Settings;
@@ skipping 154 matching lines @@
   }
 
   // Dependencies that can include files from this target.
   const std::set<Label>& allow_circular_includes_from() const {
     return allow_circular_includes_from_;
   }
   std::set<Label>& allow_circular_includes_from() {
     return allow_circular_includes_from_;
   }
 
-  const UniqueVector<const Target*>& inherited_libraries() const {
+  const InheritedLibraries& inherited_libraries() const {
     return inherited_libraries_;
   }
 
   // This config represents the configuration set directly on this target.
   ConfigValues& config_values() { return config_values_; }
   const ConfigValues& config_values() const { return config_values_; }
 
   ActionValues& action_values() { return action_values_; }
   const ActionValues& action_values() const { return action_values_; }
 
@@ skipping 31 matching lines @@
   const OutputFile& link_output_file() const {
     return link_output_file_;
   }
   const OutputFile& dependency_output_file() const {
     return dependency_output_file_;
   }
 
  private:
   // Pulls necessary information from dependencies to this one when all
   // dependencies have been resolved.
-  void PullDependentTargetInfo();
+  void PullDependentTarget(const Target* dep, bool is_public);
+  void PullDependentTargets();
 
   // These each pull specific things from dependencies to this one when all
   // deps have been resolved.
   void PullForwardedDependentConfigs();
   void PullForwardedDependentConfigsFrom(const Target* from);
   void PullRecursiveHardDeps();
 
   // Fills the link and dependency output files when a target is resolved.
   void FillOutputFiles();
 
@@ skipping 19 matching lines @@
   LabelTargetVector public_deps_;
   LabelTargetVector data_deps_;
 
   UniqueVector<LabelConfigPair> configs_;
   UniqueVector<LabelConfigPair> all_dependent_configs_;
   UniqueVector<LabelConfigPair> public_configs_;
   UniqueVector<LabelTargetPair> forward_dependent_configs_;
 
   std::set<Label> allow_circular_includes_from_;
 
-  // Static libraries and source sets from transitive deps. These things need
-  // to be linked only with the end target (executable, shared library). Source
-  // sets do not get pushed beyond static library boundaries, and neither
-  // source sets nor static libraries get pushed beyond sahred library
-  // boundaries.
-  UniqueVector<const Target*> inherited_libraries_;
+  // Static libraries, shared, libraries, and source sets from transitive deps

[Dirk Pranke, 2015/04/15 19:31:38]

nit: extra comma after "shared"?

+  // that need to be linked.
+  InheritedLibraries inherited_libraries_;
 
   // These libs and dirs are inherited from statically linked deps and all
   // configs applying to this target.
   OrderedSet<SourceDir> all_lib_dirs_;
   OrderedSet<std::string> all_libs_;
 
   // All hard deps from this target and all dependencies. Filled in when this
   // target is marked resolved. This will not include the current target.
   std::set<const Target*> recursive_hard_deps_;
 
   ConfigValues config_values_;  // Used for all binary targets.
   ActionValues action_values_;  // Used for action[_foreach] targets.
 
   // Toolchain used by this target. Null until target is resolved.
   const Toolchain* toolchain_;
 
   // Output files. Null until the target is resolved.
   OutputFile link_output_file_;
   OutputFile dependency_output_file_;
 
   DISALLOW_COPY_AND_ASSIGN(Target);
 };
 
 #endif  // TOOLS_GN_TARGET_H_