Snap for 11104212 from 8d651d09249be3146bc4105c5569d2c27e8dd5f4 to 24Q1-release

Change-Id: I534e4eec999bd8ab8bb260c3d50ffef83ab819b2

3 files changed, 40 insertions, 31 deletions

diff --git a/Android.bp b/Android.bp
index 4bb8d91..dfe9f8b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -70,9 +70,9 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//external/rust/crates/pkcs1:__subpackages__",
-         "//external/rust/crates/sec1:__subpackages__",
-         "//system/keymint:__subpackages__",
-    ]
-    ,
+        "//external/rust/crates/pkcs1:__subpackages__",
+        "//external/rust/crates/sec1:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index aa2b569..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "run": true,
-  "vendor-available": true,
-  "features": "alloc",
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "no-host": true,
-      "add-module-block": "cargo2android_viz.bp",
-      "dep-suffixes": {
-        "der": "_nostd",
-        "spki": "_nostd"
-      },
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9d1cec5
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,34 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "alloc"
+  ],
+  "run_cargo": false,
+  "variants": [
+    {
+      "package": {
+        "pkcs8": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libder": "libder_nostd",
+        "libpkcs8": "libpkcs8_nostd",
+        "libspki": "libspki_nostd"
+      },
+      "package": {
+        "pkcs8": {
+          "add_module_block": "cargo2android_viz.bp",
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}