Remove native android_sdk_repository.

RELNOTES: Bazel no longer has the android_sdk_repository rule. Use https://github.com/bazelbuild/rules_android instead. PiperOrigin-RevId: 669397084 Change-Id: I3609759b72d51834fcddbac33b31aeda1ad25df5
bazelbuild · Aug 30, 2024 · 34c359c · 34c359c
1 parent bf27b7d
commit 34c359c
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 1,424 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
@@ -76,8 +76,6 @@
 import com.google.devtools.build.lib.bazel.repository.downloader.UrlRewriterParseException;
 import com.google.devtools.build.lib.bazel.repository.starlark.StarlarkRepositoryFunction;
 import com.google.devtools.build.lib.bazel.repository.starlark.StarlarkRepositoryModule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
 import com.google.devtools.build.lib.clock.Clock;
 import com.google.devtools.build.lib.cmdline.LabelConstants;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
@@ -195,7 +193,6 @@ public static ImmutableMap<String, RepositoryFunction> repositoryRules() {
  return ImmutableMap.<String, RepositoryFunction>builder()
  .put(LocalRepositoryRule.NAME, new LocalRepositoryFunction())
  .put(NewLocalRepositoryRule.NAME, new NewLocalRepositoryFunction())
- .put(AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction())
  .put(LocalConfigPlatformRule.NAME, new LocalConfigPlatformFunction())
  .buildOrThrow();
  }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -36,7 +36,6 @@
 import com.google.devtools.build.lib.analysis.config.RequiresOptions;
 import com.google.devtools.build.lib.bazel.BazelConfiguration;
 import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSdkRule;
 import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSemantics;
 import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidToolsDefaultsJarRule;
@@ -421,7 +420,6 @@ public ImmutableList<RuleSet> requires() {
  public void init(ConfiguredRuleClassProvider.Builder builder) {
  // TODO(ulfjack): Split this up by conceptual units.
  builder.addRuleDefinition(new NewLocalRepositoryRule());
- builder.addRuleDefinition(new AndroidSdkRepositoryRule());
  builder.addRuleDefinition(new LocalConfigPlatformRule());
 
  try {