cargo_embargo: generate host variants

Gnurou · Jul 12, 2024 · e04dee8 · e04dee8
1 parent 00cce08
commit e04dee8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/cargo_embargo.json b/cargo_embargo.json
@@ -2,14 +2,7 @@
   "module_blocklist": ["runbindgen", "runbindgen_test_src_main"],
   "package": {
     "v4l2r": {
-      "host_supported": false,
       "dep_blocklist": ["libctrlc", "libclap"]
-    },
-    "v4l2r-ffi": {
-      "host_supported": false
-    },
-    "v4l2r-utils": {
-      "host_supported": false
     }
   },
   "run_cargo": false,

diff --git a/ffi/Android.bp b/ffi/Android.bp
@@ -6,6 +6,7 @@
 // DO NOT SUBMIT: Add license before submitting.
 rust_library {
     name: "libv4l2r_ffi",
+    host_supported: true,
     crate_name: "v4l2r_ffi",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.1",
@@ -33,6 +34,7 @@ rust_library {
 
 rust_ffi_static {
     name: "libv4l2r_ffi_static",
+    host_supported: true,
     crate_name: "v4l2r_ffi",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.1",
@@ -60,12 +62,16 @@ rust_ffi_static {
 
 rust_test {
     name: "v4l2r-ffi_test_src_lib",
+    host_supported: true,
     crate_name: "v4l2r_ffi",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.1",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2021",
     features: [
         "default",

diff --git a/lib/Android.bp b/lib/Android.bp
@@ -6,6 +6,7 @@
 // DO NOT SUBMIT: Add license before submitting.
 rust_library {
     name: "libv4l2r",
+    host_supported: true,
     crate_name: "v4l2r",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.2",
@@ -29,12 +30,16 @@ rust_library {
 
 rust_test {
     name: "v4l2r_test_src_lib",
+    host_supported: true,
     crate_name: "v4l2r",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.2",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2021",
     rustlibs: [
         "libanyhow",

diff --git a/utils/Android.bp b/utils/Android.bp
@@ -6,6 +6,7 @@
 // DO NOT SUBMIT: Add license before submitting.
 rust_library {
     name: "libv4l2r_utils",
+    host_supported: true,
     crate_name: "v4l2r_utils",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.1",
@@ -28,12 +29,16 @@ rust_library {
 
 rust_test {
     name: "v4l2r-utils_test_src_lib",
+    host_supported: true,
     crate_name: "v4l2r_utils",
     cargo_env_compat: true,
     cargo_pkg_version: "0.0.1",
     crate_root: "src/lib.rs",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2021",
     rustlibs: [
         "libanyhow",