diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-26 07:09:17 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-26 07:09:17 +0000 |
| commit | 72bbbe627335118584c47183d0ee549271f8f302 (patch) | |
| tree | ac226820d3e09a452ee0a52e8d30ca20d3dcb390 | |
| parent | b1dc427617f7c8435324fdd2e8e6159682c7dcc3 (diff) | |
| parent | da8b98924413d817206f743e7b33cab1e4b8aa14 (diff) | |
| download | grpcio-sys-busytown-mac-infra-release.tar.gz | |
Snap for 11878398 from da8b98924413d817206f743e7b33cab1e4b8aa14 to busytown-mac-infra-releasebusytown-mac-infra-release
Change-Id: I78d469b6f17fecb128bda1eb39062001d68d1305
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
2 files changed, 9 insertions, 12 deletions
@@ -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", |