summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp8
-rw-r--r--patches/Android.bp.patch13
2 files changed, 9 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp
index be6fa61f..672c64f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,17 +42,17 @@ rust_library {
crate_name: "grpcio_sys",
cargo_env_compat: true,
cargo_pkg_version: "0.13.0+1.56.2-patched",
- srcs: [
- "src/lib.rs",
- ":libgrpc_bindgen",
- ],
+ crate_root: "src/lib.rs",
+ srcs: [":libgrpc_bindgen"],
edition: "2018",
features: [
"_gen-bindings",
+ "_libz-sys",
"_secure",
"bindgen",
"boringssl",
"boringssl-src",
+ "libz-sys",
],
rustlibs: [
"liblibc",
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 8b9433aa..eb17aead 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,13 +1,10 @@
-diff --git a/Android.bp b/Android.bp
-index eb98772..ae4702d 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -40,7 +40,7 @@ rust_library {
- crate_name: "grpcio_sys",
+--- Android.bp.orig 2024-05-21 14:41:37.180664996 +0100
++++ Android.bp 2024-05-21 14:43:05.926077455 +0100
+@@ -43,6 +43,7 @@
cargo_env_compat: true,
cargo_pkg_version: "0.13.0+1.56.2-patched",
-- srcs: ["src/lib.rs"],
-+ srcs: ["src/lib.rs", ":libgrpc_bindgen"],
+ crate_root: "src/lib.rs",
++ srcs: [":libgrpc_bindgen"],
edition: "2018",
features: [
"_gen-bindings",