cargo-apk: Add --device arg to select adb device by serial (#329)

Co-authored-by: Marijn Suijten <marijn@traverseresearch.nl>

cargo-apk/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Upgrade to latest `ndk-build` to deduplicate libraries before packaging them into the APK. ([#333](https://github.com/rust-windowing/android-ndk-rs/pull/333))
 - Support `android:resizeableActivity`. ([#338](https://github.com/rust-windowing/android-ndk-rs/pull/338))
+- Add `--device` argument to select `adb` device by serial (see `adb devices` for connected devices and their serial). ([#329](https://github.com/rust-windowing/android-ndk-rs/pull/329))
 
 # 0.9.3 (2022-07-05)
 

cargo-apk/src/apk.rs

@@ -17,18 +17,24 @@ pub struct ApkBuilder<'a> {
     manifest: Manifest,
     build_dir: PathBuf,
     build_targets: Vec<Target>,
+    device_serial: Option<String>,
 }
 
 impl<'a> ApkBuilder<'a> {
-    pub fn from_subcommand(cmd: &'a Subcommand) -> Result<Self, Error> {
+    pub fn from_subcommand(
+        cmd: &'a Subcommand,
+        device_serial: Option<String>,
+    ) -> Result<Self, Error> {
         let ndk = Ndk::from_env()?;
         let mut manifest = Manifest::parse_from_toml(cmd.manifest())?;
         let build_targets = if let Some(target) = cmd.target() {
             vec![Target::from_rust_triple(target)?]
         } else if !manifest.build_targets.is_empty() {
             manifest.build_targets.clone()
         } else {
-            vec![ndk.detect_abi().unwrap_or(Target::Arm64V8a)]
+            vec![ndk
+                .detect_abi(device_serial.as_deref())
+                .unwrap_or(Target::Arm64V8a)]
         };
         let build_dir = dunce::simplified(cmd.target_dir())
             .join(cmd.profile())
@@ -93,6 +99,7 @@ impl<'a> ApkBuilder<'a> {
             manifest,
             build_dir,
             build_targets,
+            device_serial,
         })
     }
 
@@ -236,14 +243,14 @@ impl<'a> ApkBuilder<'a> {
 
     pub fn run(&self, artifact: &Artifact) -> Result<(), Error> {
         let apk = self.build(artifact)?;
-        apk.install()?;
-        apk.start()?;
+        apk.install(self.device_serial.as_deref())?;
+        apk.start(self.device_serial.as_deref())?;
         Ok(())
     }
 
     pub fn gdb(&self, artifact: &Artifact) -> Result<(), Error> {
         self.run(artifact)?;
-        let abi = self.ndk.detect_abi()?;
+        let abi = self.ndk.detect_abi(self.device_serial.as_deref())?;
         let target_dir = self.build_dir.join(artifact);
         let jni_dir = target_dir.join("jni");
         std::fs::create_dir_all(&jni_dir)?;

cargo-apk/src/main.rs

@@ -5,8 +5,22 @@ use std::process::Command;
 fn main() -> anyhow::Result<()> {
     env_logger::init();
     let args = std::env::args();
-    let cmd = Subcommand::new(args, "apk", |_, _| Ok(false)).map_err(Error::Subcommand)?;
-    let builder = ApkBuilder::from_subcommand(&cmd)?;
+    let mut device_serial = None;
+    let cmd = Subcommand::new(args, "apk", |name, value| {
+        if name == "--device" {
+            if let Some(value) = value {
+                println!("Running on {}", value);
+                device_serial = Some(value.to_owned());
+                Ok(true)
+            } else {
+                Err(cargo_subcommand::Error::InvalidArgs)
+            }
+        } else {
+            Ok(false)
+        }
+    })
+    .map_err(Error::Subcommand)?;
+    let builder = ApkBuilder::from_subcommand(&cmd, device_serial)?;
 
     match cmd.cmd() {
         "check" | "c" => builder.check()?,
@@ -70,6 +84,10 @@ SUBCOMMAND:
     run, r      Run a binary or example of the local package
     gdb         Start a gdb session attached to an adb device with symbols loaded
     version     Print the version of cargo-apk
+
+OPTIONS:
+    --device    Use device with the given serial. See `adb devices` for a list of
+                connected Android devices.
 "#
     );
 }

ndk-build/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 
 - **Breaking:** Postpone APK library packaging until before zip alignment, to deduplicate possibly overlapping entries. ([#333](https://github.com/rust-windowing/android-ndk-rs/pull/333))
+- Add `adb` device serial parameter to `detect_abi()` and `Apk::{install,start}()`. ([#329](https://github.com/rust-windowing/android-ndk-rs/pull/329))
 
 # 0.7.0 (2022-07-05)
 

ndk-build/src/apk.rs

@@ -190,17 +190,27 @@ impl Apk {
         }
     }
 
-    pub fn install(&self) -> Result<(), NdkError> {
+    pub fn install(&self, device_serial: Option<&str>) -> Result<(), NdkError> {
         let mut adb = self.ndk.platform_tool(bin!("adb"))?;
+
+        if let Some(device_serial) = device_serial {
+            adb.arg("-s").arg(device_serial);
+        }
+
         adb.arg("install").arg("-r").arg(&self.path);
         if !adb.status()?.success() {
             return Err(NdkError::CmdFailed(adb));
         }
         Ok(())
     }
 
-    pub fn start(&self) -> Result<(), NdkError> {
+    pub fn start(&self, device_serial: Option<&str>) -> Result<(), NdkError> {
         let mut adb = self.ndk.platform_tool(bin!("adb"))?;
+
+        if let Some(device_serial) = device_serial {
+            adb.arg("-s").arg(device_serial);
+        }
+
         adb.arg("shell")
             .arg("am")
             .arg("start")

ndk-build/src/ndk.rs

@@ -377,9 +377,14 @@ impl Ndk {
         Err(NdkError::PlatformNotFound(min_sdk_version))
     }
 
-    pub fn detect_abi(&self) -> Result<Target, NdkError> {
-        let stdout = self
-            .platform_tool("adb")?
+    pub fn detect_abi(&self, device_serial: Option<&str>) -> Result<Target, NdkError> {
+        let mut adb = self.platform_tool("adb")?;
+
+        if let Some(device_serial) = device_serial {
+            adb.arg("-s").arg(device_serial);
+        }
+
+        let stdout = adb
             .arg("shell")
             .arg("getprop")
             .arg("ro.product.cpu.abi")