GN threading refactor

tools/gn/target.cc

 // 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.
 
 #include "tools/gn/target.h"
 
 #include "base/bind.h"
 #include "tools/gn/config_values_extractors.h"
 #include "tools/gn/scheduler.h"
 
@@ skipping 42 matching lines @@
     }
   }
 }
 
 }  // namespace
 
 Target::Target(const Settings* settings, const Label& label)
     : Item(settings, label),
       output_type_(UNKNOWN),
       hard_dep_(false),
-      external_(false),
-      generated_(false),
-      generator_function_(NULL) {
+      external_(false) {
 }
 
 Target::~Target() {
 }
 
 // static
 const char* Target::GetStringForOutputType(OutputType type) {
   switch (type) {
     case UNKNOWN:
       return "Unknown";
@@ skipping 69 matching lines @@
   }
 
   if (output_type_ != GROUP) {
     // Don't pull target info like libraries and configs from dependencies into
     // a group target. When A depends on a group G, the G's dependents will
     // be treated as direct dependencies of A, so this is unnecessary and will
     // actually result in duplicated settings (since settings will also be
     // pulled from G to A in case G has configs directly on it).
     PullDependentTargetInfo(&unique_configs);
   }
-
-  // Mark as resolved.
-  if (!settings()->build_settings()->target_resolved_callback().is_null()) {
-    g_scheduler->ScheduleWork(base::Bind(&TargetResolvedThunk,
-        settings()->build_settings()->target_resolved_callback(),
-        this));
-  }
-}
-
-bool Target::HasBeenGenerated() const {
-  return generated_;
-}
-
-void Target::SetGenerated(const Token* token) {
-  DCHECK(!generated_);
-  generated_ = true;
-  generator_function_ = token;
 }
 
 bool Target::IsLinkable() const {
   return output_type_ == STATIC_LIBRARY || output_type_ == SHARED_LIBRARY;
 }
 
 void Target::PullDependentTargetInfo(std::set<const Config*>* unique_configs) {
   // Gather info from our dependents we need.
   for (size_t dep_i = 0; dep_i < deps_.size(); dep_i++) {
     const Target* dep = deps_[dep_i].ptr;
     MergeAllDependentConfigsFrom(dep, unique_configs, &configs_,
                                  &all_dependent_configs_);
     MergeDirectDependentConfigsFrom(dep, unique_configs, &configs_);
 
     // Direct dependent libraries.
     if (dep->output_type() == STATIC_LIBRARY ||
         dep->output_type() == SHARED_LIBRARY ||
         dep->output_type() == SOURCE_SET)
       inherited_libraries_.insert(dep);
 
     // Inherited libraries and flags are inherited across static library
-    // boundaries. For external targets, assume that the external_link_deps
-    // will take care of this.
-    if ((!dep->external() ||
-         !settings()->build_settings()->using_external_generator()) &&
-        dep->output_type() != SHARED_LIBRARY &&
+    // boundaries.
+    if (dep->output_type() != SHARED_LIBRARY &&
         dep->output_type() != EXECUTABLE) {
       const std::set<const Target*> inherited = dep->inherited_libraries();
       for (std::set<const Target*>::const_iterator i = inherited.begin();
            i != inherited.end(); ++i)
         inherited_libraries_.insert(*i);
 
       // Inherited library settings.
       all_lib_dirs_.append(dep->all_lib_dirs());
       all_libs_.append(dep->all_libs());
     }
   }
 
   // Forward direct dependent configs if requested.
   for (size_t dep = 0; dep < forward_dependent_configs_.size(); dep++) {
     const Target* from_target = forward_dependent_configs_[dep].ptr;
 
     // The forward_dependent_configs_ must be in the deps already, so we
     // don't need to bother copying to our configs, only forwarding.
     DCHECK(std::find_if(deps_.begin(), deps_.end(),
                         LabelPtrPtrEquals<Target>(from_target)) !=
            deps_.end());
     direct_dependent_configs_.insert(
         direct_dependent_configs_.end(),
         from_target->direct_dependent_configs().begin(),
         from_target->direct_dependent_configs().end());
   }
 }