commit 87944b508d785ba4dc134082fb3652fe587d1a1b
author Andrew Walbran <qwandor@google.com> Wed Nov 15 20:31:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 20:31:35 2023 +0000
tree 4a0798ba9bdba706ed2cd73db3fe4182f23ad543
parent 6c47633963752a01223acd2b8161d921f07b964f
parent ade89fb953477ddd71f40a569648269638f9c700

Migrate to cargo_embargo. am: ade89fb953

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

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

Android.bp

diff --git a/Android.bp b/Android.bp
index a229c53..4f11c00 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 {
@@ -82,7 +82,7 @@
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//system/keymint:__subpackages__",
-    ]
-    ,
+        "//system/keymint:__subpackages__",
+    ],
+
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bdfb1f5..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "run": true,
-  "vendor-available": true,
-  "features": "alloc,der,pkcs8",
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "no-host": true,
-      "add-module-block": "cargo2android_viz.bp",
-      "dep-suffixes": {
-        "der": "_nostd",
-        "pkcs8": "_nostd",
-        "zeroize": "_nostd"
-      },
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fae434d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,37 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "alloc",
+    "der",
+    "pkcs8"
+  ],
+  "run_cargo": false,
+  "variants": [
+    {
+      "package": {
+        "sec1": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libder": "libder_nostd",
+        "libpkcs8": "libpkcs8_nostd",
+        "libsec1": "libsec1_nostd",
+        "libzeroize": "libzeroize_nostd"
+      },
+      "package": {
+        "sec1": {
+          "add_module_block": "cargo2android_viz.bp",
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}