Snap for 11107449 from 230dba8205e6f65e401786f4082a7e55b11cc8ee to emu-34-release

Change-Id: Id360956aaef74153c378a2f89c8fc7905a28100b
diff --git a/Android.bp b/Android.bp
index d9ada78..4715ffb 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 {
@@ -41,7 +41,6 @@
 
 rust_library_host {
     name: "libproc_macro_error",
-    // has rustc warnings
     crate_name: "proc_macro_error",
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.4",
@@ -60,6 +59,4 @@
     ],
     proc_macros: ["libproc_macro_error_attr"],
     compile_multilib: "first",
-    product_available: true,
-    vendor_available: true,
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bb77633..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "host-first-multilib": true,
-  "run": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..887288a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "package": {
+    "proc-macro-error": {
+      "device_supported": false,
+      "host_first_multilib": true
+    }
+  }
+}