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: Ife98c18a8a96f5254fdc656ce261c3f9d3936317
diff --git a/cargo2android.json b/cargo2android.json
index 62f211a..c1b03ca 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,12 +1,14 @@
{
- "patch": "patches/Android.bp.patch",
"apex-available": [
- "//apex_available:platform",
+ "//apex_available:platform"
],
"device": true,
"features": "protobuf,protobuf-codec",
"min-sdk-version": "29",
"run": true,
"vendor-available": false,
- "product-available": false
+ "product-available": false,
+ "dep-suffixes": {
+ "protobuf": "_deprecated"
+ }
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 90bcf79..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5b1146f2a218f689ff2a5a81999e1d861f148ff4 Mon Sep 17 00:00:00 2001
-From: Jeff Vander Stoep <jeffv@google.com>
-Date: Wed, 22 Mar 2023 15:18:53 +0100
-Subject: [PATCH] Use version 2.x of protobuf crate
-
-Test: TH
-Bug: 270895633
-Change-Id: I65b29fa910b87af2ae32b7b7818670ae9ace4f75
----
- Android.bp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Android.bp b/Android.bp
-index f2aa77d..674b27f 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -36,7 +36,7 @@ rust_library {
- "liblibc",
- "liblog_rust",
- "libparking_lot",
-- "libprotobuf",
-+ "libprotobuf_deprecated",
- ],
- apex_available: [
- "//apex_available:platform",
---
-2.40.0.348.gf938b09366-goog
-
