commit 5ea47531eb2d85259ffb47405d1d8521221578c5
author James Farrell <jamesfarrell@google.com> Thu Sep 14 04:13:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 14 04:13:00 2023 +0000
tree 9b1553e71cfcaa4d6569b4b1b43c61fb5036e9f8
parent fcc2d748fb9509565c0ae57cb4a308afad0ccda0
parent d602dad361aec26b713409c7f0149e8287afb7c2

Cleanup cargo2android configs and patches am: 82495bc731 am: f3e150abd5 am: 926ae3f603 am: a3c0f448b8 am: d602dad361

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

Change-Id: If037df985606fe1ea9f43b254f8fc7caa342eaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index b735e27..291f6b5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,7 @@
 {
-  "patch": "patches/Android.bp.diff",
   "device": true,
-  "run": true
+  "run": true,
+  "dep-suffixes": {
+    "clap": "_3.2.23"
+  }
 }

patches/Android.bp.diff

diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index c93cf1e..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index 4356b43..699cf37 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -56,7 +56,7 @@ rust_library {
-         "libatty",
-         "libcast",
-         "libciborium",
--        "libclap",
-+        "libclap_3.2.23",
-         "libcriterion_plot",
-         "libitertools",
-         "liblazy_static",