Skip to content

Commit

Permalink
Delete native android_sdk.
Browse files Browse the repository at this point in the history
RELNOTES: Native android_sdk is no longer available within Bazel. Use https://github.com/bazelbuild/rules_android
PiperOrigin-RevId: 678699156
Change-Id: Ie389210daef754173dd07d395f520538eb6048ac
  • Loading branch information
ahumesky authored and copybara-github committed Sep 25, 2024
1 parent 56af167 commit 2dc4abe
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 1,124 deletions.
5 changes: 0 additions & 5 deletions WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file will replace the content of the WORKSPACE file when Bzlmod is enabled
# No WORKSPACE prefix or suffix are added.

bind(
name = "android/sdk",
actual = "@bazel_tools//tools/android:poison_pill_android_sdk",
)

bind(
name = "android/dx_jar_import",
actual = "@bazel_tools//tools/android:no_android_sdk_repository_error",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@
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.BazelAndroidSdkRule;
import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSemantics;
import com.google.devtools.build.lib.bazel.rules.android.BazelSdkToolchainRule;
import com.google.devtools.build.lib.bazel.rules.python.BazelPyBinaryRule;
import com.google.devtools.build.lib.bazel.rules.python.BazelPyBuiltins;
import com.google.devtools.build.lib.bazel.rules.python.BazelPyRuleClasses;
Expand Down Expand Up @@ -66,7 +64,6 @@
import com.google.devtools.build.lib.rules.android.AndroidPreDexJarProvider;
import com.google.devtools.build.lib.rules.android.AndroidProguardInfo;
import com.google.devtools.build.lib.rules.android.AndroidResourcesInfo;
import com.google.devtools.build.lib.rules.android.AndroidSdkBaseRule;
import com.google.devtools.build.lib.rules.android.AndroidSdkProvider;
import com.google.devtools.build.lib.rules.android.AndroidStarlarkCommon;
import com.google.devtools.build.lib.rules.android.ApkInfo;
Expand Down Expand Up @@ -320,10 +317,6 @@ public void init(ConfiguredRuleClassProvider.Builder builder) {
builder.addConfigurationFragment(AndroidConfiguration.class);
builder.addConfigurationFragment(BazelAndroidConfiguration.class);

builder.addRuleDefinition(new AndroidSdkBaseRule());
builder.addRuleDefinition(new BazelAndroidSdkRule());
builder.addRuleDefinition(new BazelSdkToolchainRule());

AndroidBootstrap bootstrap =
new AndroidBootstrap(
new AndroidStarlarkCommon(),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public static class Options extends FragmentOptions {
// TODO(blaze-configurability): Mark this as deprecated in favor of --android_platforms.
@Option(
name = "android_sdk",
defaultValue = "@bazel_tools//tools/android:sdk",
defaultValue = "null",
converter = LabelConverter.class,
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {
Expand Down Expand Up @@ -1152,7 +1152,6 @@ public AndroidConfiguration(BuildOptions buildOptions) throws InvalidConfigurati
@StarlarkConfigurationField(
name = "android_sdk_label",
doc = "Returns the target denoted by the value of the --android_sdk flag",
defaultLabel = AndroidRuleClasses.DEFAULT_SDK,
defaultInToolRepository = true)
public Label getSdk() {
return sdk;
Expand Down

This file was deleted.

Loading

0 comments on commit 2dc4abe

Please sign in to comment.