Merge "Migrate to cargo_embargo." into main am: 6d93ae5605 am: 9f5e15c2ac

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pdl-compiler/+/2828248

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

3 files changed, 11 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index db9f603..3f297c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_binary_host {
     name: "generate_canonical_tests",
     crate_name: "generate_canonical_tests",
@@ -594,4 +592,3 @@ cc_test_host {
         "libgtest",
     ],
 }
-
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 46d3c1a..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "run": true,
-    "host-first-multilib": true,
-    "add-toplevel-block": "cargo2android_toplevel.bp"
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b3817ce
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "package": {
+    "pdl-compiler": {
+      "add_toplevel_block": "cargo2android_toplevel.bp",
+      "device_supported": false,
+      "host_first_multilib": true
+    }
+  },
+  "run_cargo": false
+}