commit fcdd05c1549902076a1179debb256f40244e62fc
author Andrew Walbran <qwandor@google.com> Wed Oct 18 19:22:49 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 18 19:22:49 2023 +0000
tree 305484646f8121871e680ca684b53dd1e157ccfa
parent 7d7f7724d6a378ac2df8542ceae919e8bef3231d
parent 66e61af4a9dc7ad889c6db56bb9c090c619c1085

Migrate to cargo_embargo. am: 66e61af4a9

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

Change-Id: Ic020b42677107bc94e335d90ff5fbead48ae0e7a
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 1cb9448..7e7c1b9 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 {
@@ -48,8 +48,6 @@
         "default",
         "proc-macro2",
     ],
-    rustlibs: [
-        "libproc_macro2",
-    ],
+    rustlibs: ["libproc_macro2"],
     compile_multilib: "first",
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 5d719bf..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "host-first-multilib": true,
-    "run": true
-}

cargo_embargo.json

diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c68a096
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "package": {
+    "litrs": {
+      "device_supported": false,
+      "host_first_multilib": true
+    }
+  },
+  "run_cargo": false
+}