Merge "Upgrade grpcio-compiler to 0.12.1" into main
diff --git a/Android.bp b/Android.bp
index 3d8e91b..3b8f2de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,8 +49,6 @@
"libgrpcio_compiler",
"libprotobuf_deprecated",
],
- product_available: true,
- vendor_available: true,
}
rust_library_host {
@@ -68,6 +66,4 @@
rustlibs: [
"libprotobuf_deprecated",
],
- product_available: true,
- vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
index 595ea16..fe5cae7 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,8 @@
{
- "patch": "patches/Android.bp.patch",
"dependencies": true,
"run": true,
- "tests": true
+ "tests": true,
+ "dep-suffixes": {
+ "protobuf": "_deprecated"
+ }
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index e0dbe5c..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ad56b17ba9a2ceb34a603a58899fe0469c46e2ed Mon Sep 17 00:00:00 2001
-From: Jeff Vander Stoep <[email protected]>
-Date: Wed, 22 Mar 2023 15:35:13 +0100
-Subject: [PATCH] Use version 2.x of the protobuf crate
-
-Test: TH
-Bug: 270895633
-Change-Id: Ida6c42df913b57baadb0907f741627c3261a2f9c
----
- Android.bp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Android.bp b/Android.bp
-index fb52b72..36ef473 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -47,7 +47,7 @@ rust_binary_host {
- ],
- rustlibs: [
- "libgrpcio_compiler",
-- "libprotobuf",
-+ "libprotobuf_deprecated",
- ],
- }
-
-@@ -64,6 +64,6 @@ rust_library_host {
- "protobuf-codec",
- ],
- rustlibs: [
-- "libprotobuf",
-+ "libprotobuf_deprecated",
- ],
- }
---
-2.40.0.348.gf938b09366-goog
-
