Add ndk-sys example and fix nested -- handling

Author: bbqsrc

.github/workflows/ci.yml

@@ -97,6 +97,9 @@ jobs:
         if: runner.os != 'Windows'
         working-directory: example/openssl
         run: cargo ndk -t arm64-v8a --platform 28 build
+      - name: Run ndk-sys example
+        working-directory: example/ndk-sys
+        run: cargo ndk --target arm64-v8a --platform 26 -- clippy --all --all-features --tests -- -D warnings
       - name: Build release binary
         if: ${{ contains(matrix.name, 'Stable') }}
         run: cargo build --locked --release --target ${{ matrix.target }}

example/ndk-sys/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "ndk-sys-example"
+version = "0.1.0"
+authors = ["Brendan Molloy <brendan@bbqsrc.net>"]
+edition = "2024"
+
+[lib]
+crate-type = ["rlib", "cdylib"]
+
+[dependencies]
+ndk-sys = "0.6.0"

example/ndk-sys/src/lib.rs

@@ -0,0 +1 @@
+// This exists just to cause the ndk-sys crate to be built

src/cargo.rs

@@ -273,8 +273,7 @@ pub(crate) fn run(
         std::process::exit(1);
     }
 
-    let mut cargo_args: Vec<OsString> = cargo_args.iter().map(Into::into).collect();
-
+    let cargo_args: Vec<OsString> = cargo_args.iter().map(Into::into).collect();
     let clang_target = clang_target(triple, platform);
     let cargo_bin = env::var("CARGO").unwrap_or_else(|_| "cargo".into());
     let mut cargo_cmd = Command::new(&cargo_bin);
@@ -300,6 +299,17 @@ pub(crate) fn run(
 
     cargo_cmd.current_dir(dir).envs(envs);
 
+    let cargo_args = if !cargo_args.is_empty() && cargo_args[0].as_os_str() == "--" {
+        &cargo_args[1..]
+    } else {
+        &cargo_args[..]
+    };
+
+    // Handle the case where `--` is sent to the subcommand
+    let mid = cargo_args.iter().position(|arg| arg == "--").unwrap_or(cargo_args.len());
+    let (cargo_args, subcommand_args) = cargo_args.split_at(mid);
+    let mut cargo_args = cargo_args.to_vec();
+
     match dir.parent() {
         Some(parent) => {
             if parent != dir {
@@ -319,14 +329,13 @@ pub(crate) fn run(
     cargo_args.push("--message-format".into());
     cargo_args.push("json-render-diagnostics".into());
 
-    let cargo_args = if !cargo_args.is_empty() && cargo_args[0].as_os_str() == "--" {
-        &cargo_args[1..]
-    } else {
-        &cargo_args[..]
-    };
+    cargo_cmd.args(&cargo_args);
+
+    if !subcommand_args.is_empty() {
+        cargo_cmd.args(subcommand_args);
+    }
 
     let mut child = cargo_cmd
-        .args(cargo_args)
         .stdin(Stdio::inherit())
         .stderr(Stdio::inherit())
         .stdout(Stdio::piped())

src/cli/mod.rs

@@ -439,6 +439,8 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
         }
     };
 
+    println!("args: {args:#?}");
+
     if args.cargo_args.is_empty() {
         shell.error("No args found to pass to cargo!")?;
         shell.note("You still need to specify build arguments to cargo to achieve anything. :)")?;