Stop propagation of dependent configs between toolchains.
In the following scenario:
//foo:a (toolchain1) -> //foo:b (toolchain2) -> //foo:c (toolchain2)
Any dependent configs from //foo:b or //foo:c will not get added to //foo:a
because it is part of a different toolchain but any dependent config
from //foo:c will still get added to //foo:b because both targets are part of
the same toolchain.
BUG=675224
R=dpranke@chromium.org
Review-Url: https://codereview.chromium.org/2605963002
Cr-Original-Commit-Position: refs/heads/master@{#441341}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d1316080967dfa9cd57b11269e25aedceb170514
diff --git a/tools/gn/target.cc b/tools/gn/target.cc
index 4430512..759d7bf 100644
--- a/tools/gn/target.cc
+++ b/tools/gn/target.cc
@@ -352,8 +352,10 @@
// private deps. This step re-exports them as public configs for targets that
// depend on this one.
for (const auto& dep : public_deps_) {
- public_configs_.Append(dep.ptr->public_configs().begin(),
- dep.ptr->public_configs().end());
+ if (dep.ptr->toolchain() == toolchain()) {
+ public_configs_.Append(dep.ptr->public_configs().begin(),
+ dep.ptr->public_configs().end());
+ }
}
// Copy our own libs and lib_dirs to the final set. This will be from our
@@ -502,10 +504,17 @@
}
void Target::PullDependentTargetConfigs() {
- for (const auto& pair : GetDeps(DEPS_LINKED))
- MergeAllDependentConfigsFrom(pair.ptr, &configs_, &all_dependent_configs_);
- for (const auto& pair : GetDeps(DEPS_LINKED))
- MergePublicConfigsFrom(pair.ptr, &configs_);
+ for (const auto& pair : GetDeps(DEPS_LINKED)) {
+ if (pair.ptr->toolchain() == toolchain()) {
+ MergeAllDependentConfigsFrom(pair.ptr, &configs_,
+ &all_dependent_configs_);
+ }
+ }
+ for (const auto& pair : GetDeps(DEPS_LINKED)) {
+ if (pair.ptr->toolchain() == toolchain()) {
+ MergePublicConfigsFrom(pair.ptr, &configs_);
+ }
+ }
}
void Target::PullDependentTargetLibsFrom(const Target* dep, bool is_public) {
diff --git a/tools/gn/target_unittest.cc b/tools/gn/target_unittest.cc
index 9bfeed5..9ddcf37 100644
--- a/tools/gn/target_unittest.cc
+++ b/tools/gn/target_unittest.cc
@@ -137,6 +137,61 @@
EXPECT_EQ(&all, a_fwd.all_dependent_configs()[0].ptr);
}
+// Tests that dependent configs don't propagate between toolchains.
+TEST(Target, NoDependentConfigsBetweenToolchains) {
+ TestWithScope setup;
+ Err err;
+
+ // Create another toolchain.
+ Toolchain other_toolchain(setup.settings(),
+ Label(SourceDir("//other/"), "toolchain"));
+ TestWithScope::SetupToolchain(&other_toolchain);
+
+ // Set up a dependency chain of |a| -> |b| -> |c| where |a| has a different
+ // toolchain.
+ Target a(setup.settings(),
+ Label(SourceDir("//foo/"), "a", other_toolchain.label().dir(),
+ other_toolchain.label().name()));
+ a.set_output_type(Target::EXECUTABLE);
+ EXPECT_TRUE(a.SetToolchain(&other_toolchain, &err));
+ TestTarget b(setup, "//foo:b", Target::EXECUTABLE);
+ TestTarget c(setup, "//foo:c", Target::SOURCE_SET);
+ a.private_deps().push_back(LabelTargetPair(&b));
+ b.private_deps().push_back(LabelTargetPair(&c));
+
+ // All dependent config.
+ Config all_dependent(setup.settings(), Label(SourceDir("//foo/"), "all"));
+ ASSERT_TRUE(all_dependent.OnResolved(&err));
+ c.all_dependent_configs().push_back(LabelConfigPair(&all_dependent));
+
+ // Public config.
+ Config public_config(setup.settings(), Label(SourceDir("//foo/"), "public"));
+ ASSERT_TRUE(public_config.OnResolved(&err));
+ c.public_configs().push_back(LabelConfigPair(&public_config));
+
+ // Another public config.
+ Config public_config2(setup.settings(),
+ Label(SourceDir("//foo/"), "public2"));
+ ASSERT_TRUE(public_config2.OnResolved(&err));
+ b.public_configs().push_back(LabelConfigPair(&public_config2));
+
+ ASSERT_TRUE(c.OnResolved(&err));
+ ASSERT_TRUE(b.OnResolved(&err));
+ ASSERT_TRUE(a.OnResolved(&err));
+
+ // B should have gotten the configs from C.
+ ASSERT_EQ(3u, b.configs().size());
+ EXPECT_EQ(&public_config2, b.configs()[0].ptr);
+ EXPECT_EQ(&all_dependent, b.configs()[1].ptr);
+ EXPECT_EQ(&public_config, b.configs()[2].ptr);
+ ASSERT_EQ(1u, b.all_dependent_configs().size());
+ EXPECT_EQ(&all_dependent, b.all_dependent_configs()[0].ptr);
+
+ // A should not have gotten any configs from B or C.
+ ASSERT_EQ(0u, a.configs().size());
+ ASSERT_EQ(0u, a.all_dependent_configs().size());
+}
+
TEST(Target, InheritLibs) {
TestWithScope setup;
Err err;
