| Index: tools/gn/config_values_extractors_unittest.cc
|
| diff --git a/tools/gn/config_values_extractors_unittest.cc b/tools/gn/config_values_extractors_unittest.cc
|
| index b0c65cafd28bfd754f613b7d161f83c09c02fe0f..fa0d0700a29e743a4d31d001b575d21d35fb44f5 100644
|
| --- a/tools/gn/config_values_extractors_unittest.cc
|
| +++ b/tools/gn/config_values_extractors_unittest.cc
|
| @@ -46,9 +46,10 @@ TEST(ConfigValuesExtractors, IncludeOrdering) {
|
|
|
| Target dep2(setup.settings(), Label(SourceDir("//dep2/"), "dep2"));
|
| dep2.set_output_type(Target::SOURCE_SET);
|
| + dep2.visibility().SetPublic();
|
| dep2.SetToolchain(setup.toolchain());
|
| dep2.all_dependent_configs().push_back(LabelConfigPair(&dep2_all));
|
| - dep2.direct_dependent_configs().push_back(LabelConfigPair(&dep2_direct));
|
| + dep2.public_configs().push_back(LabelConfigPair(&dep2_direct));
|
|
|
| // Set up dep1, direct and all dependent configs.
|
| Config dep1_all(setup.settings(), Label(SourceDir("//dep1/"), "all"));
|
| @@ -62,10 +63,11 @@ TEST(ConfigValuesExtractors, IncludeOrdering) {
|
|
|
| Target dep1(setup.settings(), Label(SourceDir("//dep1/"), "dep1"));
|
| dep1.set_output_type(Target::SOURCE_SET);
|
| + dep1.visibility().SetPublic();
|
| dep1.SetToolchain(setup.toolchain());
|
| dep1.all_dependent_configs().push_back(LabelConfigPair(&dep1_all));
|
| - dep1.direct_dependent_configs().push_back(LabelConfigPair(&dep1_direct));
|
| - dep1.deps().push_back(LabelTargetPair(&dep2));
|
| + dep1.public_configs().push_back(LabelConfigPair(&dep1_direct));
|
| + dep1.private_deps().push_back(LabelTargetPair(&dep2));
|
|
|
| // Set up target, direct and all dependent configs.
|
| Config target_all(setup.settings(), Label(SourceDir("//target/"), "all"));
|
| @@ -90,9 +92,9 @@ TEST(ConfigValuesExtractors, IncludeOrdering) {
|
| target.set_output_type(Target::SOURCE_SET);
|
| target.SetToolchain(setup.toolchain());
|
| target.all_dependent_configs().push_back(LabelConfigPair(&target_all));
|
| - target.direct_dependent_configs().push_back(LabelConfigPair(&target_direct));
|
| + target.public_configs().push_back(LabelConfigPair(&target_direct));
|
| target.configs().push_back(LabelConfigPair(&target_config));
|
| - target.deps().push_back(LabelTargetPair(&dep1));
|
| + target.private_deps().push_back(LabelTargetPair(&dep1));
|
|
|
|
|
| // Additionally add some values directly on "target".
|
|
|