aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-18 16:50:27 +0100
committerAndrew Walbran <qwandor@google.com>2023-10-18 16:50:27 +0100
commit6fd24aae900fa1bfcb815aba5a861b3d97cab7c3 (patch)
treec44fc6b01071147b504ae253ee0d5d8c8cd6d285
parent64a9fd298e7c9c6433e3fbf8405e5c8564cdb0e1 (diff)
downloadeither-6fd24aae900fa1bfcb815aba5a861b3d97cab7c3.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I87676c7ce69c8a2b646a2a7e0ad2c4bc325aa1aa
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
3 files changed, 6 insertions, 9 deletions
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 @@ rust_test {
"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
+}