Cleanup cargo2android configs and patches
Use name-suffix and dep-suffixes (aosp/2751102) and remove patches no longer needed as a result. Other minor cleanups to eliminate diffs in Android.bp files
Test: Ran cargo2android
Change-Id: I74bf88c09a4186efe603d805f26b7ad316914d1f
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",
