Move Android-related discovery out of core::debuggers

While some of this information is needed by debugger discovery, it is also
needed by non-debuginfo tests, so the code doesn't belong in the `debuggers`
module.

Author: Zalathar

…/bootstrap/src/core/debuggers/android.rs src/bootstrap/src/core/android.rssrc/bootstrap/src/core/debuggers/android.rs renamed to src/bootstrap/src/core/android.rs src/bootstrap/src/core/debuggers/android.rs renamed to src/bootstrap/src/core/android.rs

@@ -29,7 +29,7 @@ use crate::core::builder::{
 };
 use crate::core::config::TargetSelection;
 use crate::core::config::flags::{Subcommand, get_completion, top_level_help};
-use crate::core::debuggers;
+use crate::core::{android, debuggers};
 use crate::utils::build_stamp::{self, BuildStamp};
 use crate::utils::exec::{BootstrapCommand, command};
 use crate::utils::helpers::{
@@ -2114,12 +2114,9 @@ Please disable assertions with `rust.debug-assertions = false`.
             builder.config.python.as_ref().expect("python is required for running rustdoc tests"),
         );
 
-        // FIXME(#148099): Currently we set these Android-related flags in all
-        // modes, even though they should only be needed in "debuginfo" mode,
-        // because the GDB-discovery code in compiletest currently assumes that
-        // `--android-cross-path` is always set for Android targets.
-        if let Some(debuggers::Android { adb_path, adb_test_dir, android_cross_path }) =
-            debuggers::discover_android(builder, target)
+        // Discover and set some flags related to running tests on Android targets.
+        if let Some(android::Android { adb_path, adb_test_dir, android_cross_path }) =
+            android::discover_android(builder, target)
         {
             cmd.arg("--adb-path").arg(adb_path);
             cmd.arg("--adb-test-dir").arg(adb_test_dir);

src/bootstrap/src/core/build_steps/test.rs

@@ -1,10 +1,8 @@
 //! Code for discovering debuggers and debugger-related configuration, so that
 //! it can be passed to compiletest when running debuginfo tests.
 
-pub(crate) use self::android::{Android, discover_android};
 pub(crate) use self::gdb::{Gdb, discover_gdb};
 pub(crate) use self::lldb::{Lldb, discover_lldb};
 
-mod android;
 mod gdb;
 mod lldb;

src/bootstrap/src/core/debuggers/mod.rs

@@ -1,3 +1,4 @@
+pub(crate) mod android;
 pub(crate) mod build_steps;
 pub(crate) mod builder;
 pub(crate) mod config;