Merge "Migrate to cargo_embargo." into main am: dd3e8e8361 am: e5cae64394

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/foreign-types/+/2822517

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

3 files changed, 15 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 9db64b6..94b1d10 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 {
@@ -45,9 +45,7 @@ rust_library_rlib {
     cargo_pkg_version: "0.3.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    rustlibs: [
-        "libforeign_types_shared",
-    ],
+    rustlibs: ["libforeign_types_shared"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 94e72b7..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "device": true,
-  "force-rlib": true,
-  "run": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..f93ab69
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,13 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "package": {
+    "foreign-types": {
+      "force_rlib": true
+    }
+  },
+  "run_cargo": false
+}