Migrate to cargo_embargo. am: ac9f1f6006 am: 7c121fa0c3

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spki/+/2833070

Change-Id: Ic669fe5de9afdfe235e3b208bf997fce9e7068ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 43 insertions, 38 deletions

diff --git a/Android.bp b/Android.bp
index e892168..cd9e590 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 {
@@ -39,9 +39,7 @@ rust_library_host {
     srcs: ["src/lib.rs"],
     edition: "2021",
     features: ["alloc"],
-    rustlibs: [
-        "libder",
-    ],
+    rustlibs: ["libder"],
 }
 
 rust_library_rlib {
@@ -52,9 +50,7 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2021",
     features: ["alloc"],
-    rustlibs: [
-        "libder_nostd",
-    ],
+    rustlibs: ["libder_nostd"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -69,10 +65,10 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//external/rust/crates/pkcs1:__subpackages__",
-         "//external/rust/crates/pkcs8:__subpackages__",
-         "//external/rust/crates/x509-cert:__subpackages__",
-         "//system/keymint:__subpackages__",
-    ]
-    ,
+        "//external/rust/crates/pkcs1:__subpackages__",
+        "//external/rust/crates/pkcs8:__subpackages__",
+        "//external/rust/crates/x509-cert:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 64e0e45..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"
-      },
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "alloc": true,
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..4b2876a
--- /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": {
+        "spki": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libder": "libder_nostd",
+        "libspki": "libspki_nostd"
+      },
+      "package": {
+        "spki": {
+          "add_module_block": "cargo2android_viz.bp",
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}