aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-10-19 12:53:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-19 12:53:01 +0000
commit94977a3d3072c72a0d31e6163953c2460f483a7c (patch)
treede821024ff0cf66aa82e8a3e5e2002dee4a1e28f
parent5ea47531eb2d85259ffb47405d1d8521221578c5 (diff)
parent346350207121fdf28c4810fded17c4401314078d (diff)
downloadcriterion-94977a3d3072c72a0d31e6163953c2460f483a7c.tar.gz
Migrate to cargo_embargo. am: 832ddf7157 am: 830c1bbfa5 am: 3463502071
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion/+/2796216 Change-Id: Ie8323b4264531ddb5e1635418965307f26e1d95f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json7
-rw-r--r--cargo_embargo.json6
3 files changed, 7 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 2448462..d2e519d 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 291f6b5..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "device": true,
- "run": true,
- "dep-suffixes": {
- "clap": "_3.2.23"
- }
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..7dcdf45
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+ "module_name_overrides": {
+ "libclap": "libclap_3.2.23"
+ },
+ "run_cargo": false
+}