Snap for 10453563 from 3f06ea56ae8ad37cfc09ff26bc1bf12a4feb9d72 to mainline-os-statsd-release
Change-Id: Ic8d2e02a5e184eadcd2a0d683092dcd3d4592c0d
diff --git a/Android.bp b/Android.bp
index 8ee540c..dd63c3a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,7 @@
rust_library {
name: "libgrpcio",
+ // has rustc warnings
host_supported: true,
crate_name: "grpcio",
cargo_env_compat: true,
@@ -36,11 +37,11 @@
"liblibc",
"liblog_rust",
"libparking_lot",
- "libprotobuf",
+ "libprotobuf_deprecated",
],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
],
min_sdk_version: "29",
}
diff --git a/cargo2android.json b/cargo2android.json
index 001bc3e..ef64aa5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,13 @@
{
+ "patch": "patches/Android.bp.patch",
"apex-available": [
"//apex_available:platform",
- "com.android.bluetooth"
+ "com.android.btservices"
],
"device": true,
"features": "protobuf,protobuf-codec",
"min-sdk-version": "29",
- "run": true
+ "run": true,
+ "vendor-available": false,
+ "product-available": false
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..90bcf79
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,28 @@
+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
+
