From 2f7c46142a0f89aa7ff307f7f5a3d2c0a5bcc581 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 23 Oct 2024 09:24:20 -0700 Subject: [PATCH] Move deprecated flag `--fat_apk_cpu` to the graveyard. PiperOrigin-RevId: 688992744 Change-Id: I3d7f105fef11870c72504513bb8e491adad2909b --- .../lib/bazel/rules/BazelRulesModule.java | 11 ++++++++ .../rules/android/AndroidConfiguration.java | 28 ------------------- .../common/builtin_exec_platforms.bzl | 4 --- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java index b1fd4a9377b580..75b74f0454075f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.runtime.Command; import com.google.devtools.build.lib.runtime.CommandEnvironment; import com.google.devtools.build.lib.util.ResourceFileLoader; +import com.google.devtools.common.options.Converters; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionEffectTag; @@ -433,6 +434,16 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio help = "No-op", deprecationWarning = ANDROID_FLAG_DEPRECATION) public boolean incompatibleUseToolchainResolution; + + @Option( + name = "fat_apk_cpu", + converter = Converters.CommaSeparatedOptionSetConverter.class, + defaultValue = "armeabi-v7a", + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, + effectTags = {OptionEffectTag.NO_OP}, + help = "No-op", + deprecationWarning = ANDROID_FLAG_DEPRECATION) + public List fatApkCpus; } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index fa3ddcc8b5a4c0..d3365161346bb8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -235,25 +235,6 @@ public static class Options extends FragmentOptions { + "'off' means that all libraries will be linked in mostly static mode.") public DynamicMode dynamicMode; - // TODO(bazel-team): Maybe merge this with --android_cpu above. - // TODO(blaze-configurability): Mark this as deprecated in favor of --android_platforms. - @Option( - name = "fat_apk_cpu", - converter = Converters.CommaSeparatedOptionSetConverter.class, - defaultValue = "armeabi-v7a", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { - OptionEffectTag.AFFECTS_OUTPUTS, - OptionEffectTag.LOADING_AND_ANALYSIS, - OptionEffectTag.LOSES_INCREMENTAL_STATE, - }, - help = - "Setting this option enables fat APKs, which contain native binaries for all " - + "specified target architectures, e.g., --fat_apk_cpu=x86,armeabi-v7a. If this " - + "flag is specified, then --android_cpu is ignored for dependencies of " - + "android_binary rules.") - public List fatApkCpus; - @Option( name = "android_platforms", converter = LabelOrderedSetConverter.class, @@ -714,15 +695,6 @@ public static class Options extends FragmentOptions { + " Starlark Android rules from https://github.com/bazelbuild/rules_android") public boolean disableNativeAndroidRules; - @Option( - name = "android hwasan", // Space is so that this cannot be set on the command line - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = {OptionMetadataTag.INTERNAL}, - help = "Whether HWASAN is enabled.") - public boolean hwasan; - @Option( name = "experimental_filter_r_jars_from_android_test", defaultValue = "false", diff --git a/src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl b/src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl index e0743f20c6830c..3cb181dc6be95b 100644 --- a/src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl +++ b/src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl @@ -153,13 +153,9 @@ bazel_fragments["AndroidConfiguration.Options"] = fragment( "//command_line_option:experimental_objc_provider_from_linked", ], outputs = [ - "//command_line_option:android hwasan", - "//command_line_option:fat_apk_cpu", "//command_line_option:Android configuration distinguisher", ], func = lambda settings: { - "//command_line_option:android hwasan": False, - "//command_line_option:fat_apk_cpu": [], "//command_line_option:Android configuration distinguisher": "main", }, )