Snap for 10453563 from 0493904e3447fccea81b05b15265150d747551de to mainline-conscrypt-release
Change-Id: I661d68c4fef757f09d4b0fbcc3d55ecf2d6f1855
diff --git a/Android.bp b/Android.bp
index fb52b72..3af481e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,8 +47,10 @@
],
rustlibs: [
"libgrpcio_compiler",
- "libprotobuf",
+ "libprotobuf_deprecated",
],
+ product_available: true,
+ vendor_available: true,
}
rust_library_host {
@@ -64,6 +66,8 @@
"protobuf-codec",
],
rustlibs: [
- "libprotobuf",
+ "libprotobuf_deprecated",
],
+ product_available: true,
+ vendor_available: true,
}
diff --git a/cargo2android.json b/cargo2android.json
index 9b0d064..595ea16 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,6 @@
{
+ "patch": "patches/Android.bp.patch",
"dependencies": true,
"run": true,
"tests": true
-}
\ No newline at end of file
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..e0dbe5c
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,36 @@
+From ad56b17ba9a2ceb34a603a58899fe0469c46e2ed Mon Sep 17 00:00:00 2001
+From: Jeff Vander Stoep <jeffv@google.com>
+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
+
