Support test and doc commands.

Author: dvc94ch

android-build-tools/src/cargo.rs

@@ -3,10 +3,9 @@ use crate::ndk::Ndk;
 use crate::target::Target;
 use std::process::Command;
 
-pub fn cargo_build(ndk: &Ndk, target: Target, sdk_version: u32) -> Result<Command, NdkError> {
+pub fn cargo_apk(ndk: &Ndk, target: Target, sdk_version: u32) -> Result<Command, NdkError> {
     let triple = target.rust_triple();
     let mut cargo = Command::new("cargo");
-    cargo.arg("build");
 
     let clang = ndk.clang(target, sdk_version)?;
     cargo.env(format!("CC_{}", triple), &clang);

android-build-tools/src/config.rs

@@ -20,17 +20,17 @@ pub struct Config {
 
 #[derive(Clone, Debug, Default, Deserialize)]
 pub struct Metadata {
-    pub(crate) target_sdk_version: Option<u32>,
-    pub(crate) min_sdk_version: Option<u32>,
-    pub(crate) icon: Option<String>,
-    pub(crate) fullscreen: Option<bool>,
-    pub(crate) opengles_version: Option<(u8, u8)>,
-    pub(crate) feature: Option<Vec<FeatureConfig>>,
-    pub(crate) permission: Option<Vec<PermissionConfig>>,
+    pub target_sdk_version: Option<u32>,
+    pub min_sdk_version: Option<u32>,
+    pub icon: Option<String>,
+    pub fullscreen: Option<bool>,
+    pub opengles_version: Option<(u8, u8)>,
+    pub feature: Option<Vec<FeatureConfig>>,
+    pub permission: Option<Vec<PermissionConfig>>,
 }
 
 #[derive(Clone, Debug, Deserialize)]
-pub(crate) struct FeatureConfig {
+pub struct FeatureConfig {
     name: String,
     required: Option<bool>,
 }
@@ -45,7 +45,7 @@ impl From<FeatureConfig> for Feature {
 }
 
 #[derive(Clone, Debug, Deserialize)]
-pub(crate) struct PermissionConfig {
+pub struct PermissionConfig {
     name: String,
     max_sdk_version: Option<u32>,
 }

cargo-apk/src/apk.rs

@@ -1,7 +1,7 @@
 use crate::error::Error;
 use crate::manifest::Manifest;
 use android_build_tools::apk::{Apk, ApkConfig};
-use android_build_tools::cargo::{cargo_build, VersionCode};
+use android_build_tools::cargo::{cargo_apk, VersionCode};
 use android_build_tools::config::Config;
 use android_build_tools::error::NdkError;
 use android_build_tools::ndk::Ndk;
@@ -75,7 +75,8 @@ impl<'a> ApkBuilder<'a> {
 
             let target_sdk_version = config.manifest.target_sdk_version;
 
-            let mut cargo = cargo_build(&config.ndk, *target, target_sdk_version)?;
+            let mut cargo = cargo_apk(&config.ndk, *target, target_sdk_version)?;
+            cargo.arg("build");
             if self.cmd.target().is_none() {
                 cargo.arg("--target").arg(target.rust_triple());
             }
@@ -110,4 +111,21 @@ impl<'a> ApkBuilder<'a> {
         Command::new("ndk-gdb").current_dir(target_dir).status()?;
         Ok(())
     }
+
+    pub fn default(&self) -> Result<(), Error> {
+        let ndk = Ndk::from_env()?;
+        let target_sdk_version = self
+            .manifest
+            .metadata
+            .target_sdk_version
+            .unwrap_or_else(|| ndk.default_platform());
+        for target in &self.build_targets {
+            let mut cargo = cargo_apk(&ndk, *target, target_sdk_version)?;
+            cargo.args(self.cmd.args());
+            if !cargo.status()?.success() {
+                return Err(NdkError::CmdFailed(cargo).into());
+            }
+        }
+        Ok(())
+    }
 }

cargo-apk/src/main.rs

@@ -22,6 +22,9 @@ fn main() -> Result<(), ExitDisplay<Error>> {
                 return Err(Error::invalid_args().into());
             }
         }
+        "--" => {
+            builder.default()?;
+        }
         "gdb" => {
             if cmd.artifacts().len() == 1 {
                 builder.gdb(&cmd.artifacts()[0])?;
@@ -32,7 +35,7 @@ fn main() -> Result<(), ExitDisplay<Error>> {
         "help" => {
             if let Some(arg) = cmd.args().get(0) {
                 match &**arg {
-                    "build" | "run" => run_cargo(&cmd)?,
+                    "build" | "run" | "test" | "doc" => run_cargo(&cmd)?,
                     "gdb" => print_gdb_help(),
                     _ => print_help(),
                 }