Snap for 11086585 from 6eec0c098cff569127a13771db3a29d0ce7b5877 to 24Q1-release

Change-Id: I788eb13834a4c8bb2bffdbad288306f2a606fa77

3 files changed, 38 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index e91dd30..6e84e54 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 {
@@ -63,8 +63,8 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//external/rust/crates/der:__subpackages__",
-         "//external/rust/crates/x509-cert:__subpackages__",
-    ]
-    ,
+        "//external/rust/crates/der:__subpackages__",
+        "//external/rust/crates/x509-cert:__subpackages__",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f55aa53..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "run": true,
-  "vendor-available": true,
-  "features": "db",
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "alloc": true,
-      "no-host": true,
-      "add-module-block": "cargo2android_viz.bp",
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..30a0361
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,33 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "db"
+  ],
+  "run_cargo": false,
+  "variants": [
+    {
+      "package": {
+        "const-oid": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libconst_oid": "libconst_oid_nostd"
+      },
+      "package": {
+        "const-oid": {
+          "add_module_block": "cargo2android_viz.bp",
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}