Index: tools/gn/target.cc |
diff --git a/tools/gn/target.cc b/tools/gn/target.cc |
index 28dcf91f2da7136c95b6f381d382c1efdf5b4b5e..b12d284e957880ab33a2266b868fa358c6b60160 100644 |
--- a/tools/gn/target.cc |
+++ b/tools/gn/target.cc |
@@ -60,9 +60,7 @@ 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() { |
@@ -152,23 +150,6 @@ void Target::OnResolved() { |
// 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 { |
@@ -190,11 +171,8 @@ void Target::PullDependentTargetInfo(std::set<const Config*>* unique_configs) { |
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(); |