Add back android config_setting that looks for //external:android/cro…

…sstool (#16127) (#16264) In #15298 `"crosstool_top": "//external:android/crosstool"` was replaced with `"crosstool_top": "@platforms//os:android"`. This breaks users who have not migrated to https://bazel.build/concepts/platforms yet. Closes #16127 COPYBARA_INTEGRATE_REVIEW=#16127 from sifmelcara:add-back-legacy-crosstool-top c643235 PiperOrigin-RevId: 615449874 Co-authored-by: Ming-Chuan <[email protected]>
protocolbuffers · Mar 22, 2024 · a97c927 · a97c927
1 parent 1ffebb2
commit a97c927
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
@@ -35,13 +35,23 @@ config_setting(
 # For more info on the various crosstool_tops used by NDK Bazel builds, see:
 # https://docs.bazel.build/versions/master/android-ndk.html#configuring-the-stl
 
+# When using https://bazel.build/concepts/platforms
 config_setting(
     name = "config_android",
     values = {
         "crosstool_top": "@platforms//os:android",
     },
 )
 
+# When using legacy flags like --android_crosstool_top, --android_cpu, and --fat_apk_cpu
+config_setting(
+    name = "config_android-legacy-default-crosstool",
+    values = {
+        # Default of `--android_crosstool_top`
+        "crosstool_top": "//external:android/crosstool",
+    },
+)
+
 config_setting(
     name = "config_android-stlport",
     values = {

diff --git a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl
@@ -29,6 +29,7 @@ COPTS = select({
 # Android and MSVC builds do not need to link in a separate pthread library.
 LINK_OPTS = select({
     "//build_defs:config_android": [],
+    "//build_defs:config_android-legacy-default-crosstool": [],
     "//build_defs:config_android-stlport": [],
     "//build_defs:config_android-libcpp": [],
     "//build_defs:config_android-gnu-libstdcpp": [],