Support building APKs from Android host

rust-mobile · Sep 14, 2023 · 909fe13 · 909fe13
1 parent 6caae75
commit 909fe13
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/xbuild/src/command/build.rs b/xbuild/src/command/build.rs
@@ -19,9 +19,9 @@ pub fn build(env: &BuildEnv) -> Result<()> {
     let mut runner = TaskRunner::new(3, env.verbose());
 
     runner.start_task("Fetch precompiled artifacts");
-    let manager = DownloadManager::new(env)?;
+    let manager = DownloadManager::new(env).context("Creating DownloadManager")?;
     if !env.offline() {
-        manager.prefetch()?;
+        manager.prefetch().context("prefetch")?;
         runner.end_verbose_task();
     }
 

diff --git a/xbuild/src/download.rs b/xbuild/src/download.rs
@@ -1,6 +1,7 @@
 use crate::{BuildEnv, Platform};
-use anyhow::Result;
+use anyhow::{Context, Result};
 use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
+use log::info;
 use mvn::Download;
 use reqwest::blocking::Client;
 use std::fs::File;
@@ -37,7 +38,10 @@ impl<'a> Download for DownloadManager<'a> {
         let len = resp.content_length().unwrap_or_default();
         pb.set_length(len);
 
-        let dest = BufWriter::new(File::create(dest)?);
+        let dest = BufWriter::new(
+            File::create(dest)
+                .with_context(|| format!("While creating download output file `{dest:?}`"))?,
+        );
         std::io::copy(&mut resp, &mut pb.wrap_write(dest))?;
         pb.finish_with_message("📥 downloaded");
 
@@ -138,9 +142,14 @@ impl<'a> DownloadManager<'a> {
                 self.macos_sdk()?;
             }
             Platform::Android => {
-                self.rustup_target("aarch64-linux-android")?;
-                self.android_ndk()?;
-                self.android_jar()?;
+                if Platform::host()? != Platform::Android {
+                    self.rustup_target("aarch64-linux-android")
+                        .context("rustup_target")?;
+                } else {
+                    info!("Skipping `rustup` for Android target");
+                }
+                self.android_ndk().context("ndk")?;
+                self.android_jar().context("jar")?;
             }
             Platform::Ios => {
                 self.rustup_target("aarch64-apple-ios")?;

diff --git a/xbuild/src/lib.rs b/xbuild/src/lib.rs
@@ -51,7 +51,9 @@ pub enum Platform {
 
 impl Platform {
     pub fn host() -> Result<Self> {
-        Ok(if cfg!(target_os = "linux") {
+        Ok(if cfg!(target_os = "android") {
+            Platform::Android
+        } else if cfg!(target_os = "linux") {
             Platform::Linux
         } else if cfg!(target_os = "macos") {
             Platform::Macos