Skip to content

Commit

Permalink
Move deprecated --android_sdk flag to the graveyard.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 682001805
Change-Id: I8e2180fc998496323dd894d25941ca88b72a44ca
  • Loading branch information
katre authored and copybara-github committed Oct 3, 2024
1 parent 5019697 commit 64c421c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,15 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio
+ " https://blog.bazel.build/2023/11/15/android-platforms.html for details and"
+ " migration directions";

@Option(
name = "android_sdk",
defaultValue = "",
documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.UNKNOWN},
help = "No-op",
deprecationWarning = ANDROID_FLAG_DEPRECATION)
public String sdk;

@Option(
name = "android_cpu",
defaultValue = "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,22 +235,6 @@ public static class Options extends FragmentOptions {
+ "'off' means that all libraries will be linked in mostly static mode.")
public DynamicMode dynamicMode;

// Label of filegroup combining all Android tools used as implicit dependencies of
// android_* rules
// TODO(blaze-configurability): Mark this as deprecated in favor of --android_platforms.
@Option(
name = "android_sdk",
defaultValue = "null",
converter = LabelConverter.class,
documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
effectTags = {
OptionEffectTag.CHANGES_INPUTS,
OptionEffectTag.LOADING_AND_ANALYSIS,
OptionEffectTag.LOSES_INCREMENTAL_STATE,
},
help = "Specifies Android SDK/platform that is used to build Android applications.")
public Label sdk;

// TODO(bazel-team): Maybe merge this with --android_cpu above.
// TODO(blaze-configurability): Mark this as deprecated in favor of --android_platforms.
@Option(
Expand Down

0 comments on commit 64c421c

Please sign in to comment.