Migrate to cargo_embargo. am: 6fd24aae90 am: b4f83899c6 am: 1c64c60b55
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/2796179
Change-Id: I72aae4dfb2c7b7dfc96e0b58f15b3d1ad402c237
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 345783b..d563a0e 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 {
@@ -54,9 +54,7 @@
"default",
"use_std",
],
- rustlibs: [
- "libserde_json",
- ],
+ rustlibs: ["libserde_json"],
}
rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..246281d
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "tests": true,
+ "run_cargo": false
+}
