diff options
| author | James Farrell <jamesfarrell@google.com> | 2023-09-14 00:41:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-14 00:41:29 +0000 |
| commit | f3e150abd5c8912db3acd27f9f218aadd49dbc11 (patch) | |
| tree | 9b1553e71cfcaa4d6569b4b1b43c61fb5036e9f8 | |
| parent | 19ca233fef56526b0864105a9061466883eca900 (diff) | |
| parent | 82495bc73199fd976e46962437d9f851322853b6 (diff) | |
| download | criterion-f3e150abd5c8912db3acd27f9f218aadd49dbc11.tar.gz | |
Cleanup cargo2android configs and patches am: 82495bc731
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion/+/2750926
Change-Id: I5b2e7d10ccd82a362b79cd45362c6f6819d5e3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cargo2android.json | 6 | ||||
| -rw-r--r-- | patches/Android.bp.diff | 13 |
2 files changed, 4 insertions, 15 deletions
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" + } } 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", |