ndk-build: Fix missing adb .exe extension in detect_abi() by dedu…

…plicating `adb` command building (#339)
rust-mobile · Sep 7, 2022 · f59edda · f59edda
1 parent 282af7d
commit f59edda
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/ndk-build/CHANGELOG.md b/ndk-build/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - **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))
+- Fix missing `.exe` extension for `adb` on Windows inside `detect_abi()`. ([#339](https://github.com/rust-windowing/android-ndk-rs/pull/339))
 
 # 0.7.0 (2022-07-05)
 

diff --git a/ndk-build/src/apk.rs b/ndk-build/src/apk.rs
@@ -191,11 +191,7 @@ impl Apk {
     }
 
     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);
-        }
+        let mut adb = self.ndk.adb(device_serial)?;
 
         adb.arg("install").arg("-r").arg(&self.path);
         if !adb.status()?.success() {
@@ -205,11 +201,7 @@ impl Apk {
     }
 
     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);
-        }
+        let mut adb = self.ndk.adb(device_serial)?;
 
         adb.arg("shell")
             .arg("am")

diff --git a/ndk-build/src/ndk.rs b/ndk-build/src/ndk.rs
@@ -378,11 +378,7 @@ impl Ndk {
     }
 
     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 mut adb = self.adb(device_serial)?;
 
         let stdout = adb
             .arg("shell")
@@ -393,6 +389,16 @@ impl Ndk {
         let abi = std::str::from_utf8(&stdout).or(Err(NdkError::UnsupportedTarget))?;
         Target::from_android_abi(abi.trim())
     }
+
+    pub fn adb(&self, device_serial: Option<&str>) -> Result<Command, NdkError> {
+        let mut adb = self.platform_tool(bin!("adb"))?;
+
+        if let Some(device_serial) = device_serial {
+            adb.arg("-s").arg(device_serial);
+        }
+
+        Ok(adb)
+    }
 }
 
 pub struct Key {