Skip to content

Commit

Permalink
Don't autoload proto_common_do_not_use
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 682997914
Change-Id: I30f5f9e752d1c91e16c838639790e90f3559b0f5
  • Loading branch information
comius authored and copybara-github committed Oct 7, 2024
1 parent c92c103 commit 7518bbb
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,11 @@ public ImmutableMap<String, BzlLoadValue.Key> getLoadKeys(SkyFunction.Environmen
ImmutableMap.builderWithExpectedSize(autoloadedSymbols.size());
ImmutableSet.Builder<String> missingRepositories = ImmutableSet.builder();
for (String symbol : autoloadedSymbols) {
if (symbol.equals("proto_common_do_not_use")) {
// Special case that is not autoloaded, just removed
continue;
}

Label label = AUTOLOAD_CONFIG.get(symbol).getLabel(repoContext);
// Only load if the dependency is present
if (label.getRepository().isVisible()) {
Expand Down Expand Up @@ -610,8 +615,7 @@ private static SymbolRedirect renamedSymbolRedirect(
"proto_lang_toolchain",
"java_binary",
"proto_common_do_not_use"))
.put(
"proto_common_do_not_use", symbolRedirect("@protobuf//bazel/common:proto_common.bzl"))
.put("proto_common_do_not_use", symbolRedirect(""))
.put("cc_common", symbolRedirect("@rules_cc//cc/common:cc_common.bzl"))
.put(
"CcInfo",
Expand Down

0 comments on commit 7518bbb

Please sign in to comment.