diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-21 01:05:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-21 01:05:35 +0000 |
| commit | c52c1dea4fb9945305c1cdb1b2edf70efad70d0c (patch) | |
| tree | 9ff33245fc40085284a777f947a77028b4a715f5 /patches/Android.bp.patch | |
| parent | d8aa5068ca41be7855f4bfbf89a38ab7b254468d (diff) | |
| parent | 324f6f886c21553b93ce22e3e17f94676ef05f62 (diff) | |
| download | grpcio-sys-c52c1dea4fb9945305c1cdb1b2edf70efad70d0c.tar.gz | |
Snap for 7298338 from 324f6f886c21553b93ce22e3e17f94676ef05f62 to sc-release
Change-Id: Ib9c8ef6f972432c7c16d11d13ec89abe3e22b123
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 8cbc574a..f4c06064 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,8 +1,8 @@ diff --git a/Android.bp b/Android.bp -index 40ed7bc..12928a0 100644 +index 45707bc..d0369e6 100644 --- a/Android.bp +++ b/Android.bp -@@ -4,7 +4,10 @@ rust_library { +@@ -38,7 +38,10 @@ rust_library { name: "libgrpcio_sys", host_supported: true, crate_name: "grpcio_sys", @@ -13,8 +13,8 @@ index 40ed7bc..12928a0 100644 + ], edition: "2018", features: [ - "default", -@@ -14,48 +17,56 @@ rust_library { + "bindgen", +@@ -50,50 +53,58 @@ rust_library { "liblibc", "liblibz_sys", ], @@ -27,7 +27,6 @@ index 40ed7bc..12928a0 100644 - "libabsl_cord", - "libabsl_debugging_internal", - "libabsl_demangle_internal", -- "libabsl_dynamic_annotations", - "libabsl_exponential_biased", - "libabsl_graphcycles_internal", - "libabsl_hash", @@ -40,6 +39,7 @@ index 40ed7bc..12928a0 100644 - "libabsl_spinlock_wait", - "libabsl_stacktrace", - "libabsl_status", +- "libabsl_statusor", - "libabsl_str_format_internal", - "libabsl_strings", - "libabsl_strings_internal", @@ -61,15 +61,15 @@ index 40ed7bc..12928a0 100644 + shared_libs: [ + "libgrpc++", + "libgrpc_wrap" - ], -- shared_libs: ["libstdc++"], ++ ], +} + +cc_defaults { + name: "libgrpcio_sys_defaults", + cflags: [ + "-DGRPC_SYS_SECURE", -+ ], + ], +- shared_libs: ["libstdc++"], + cpp_std: "c++11", + shared_libs: ["libgrpc++"], +} @@ -79,8 +79,8 @@ index 40ed7bc..12928a0 100644 + defaults: ["libgrpcio_sys_defaults"], + host_supported: true, + srcs: ["grpc_wrap.cc"], -+} -+ + } + +rust_bindgen { + name: "libgrpc_bindgen", + defaults: ["libgrpcio_sys_defaults"], @@ -109,6 +109,8 @@ index 40ed7bc..12928a0 100644 + "--blacklist-type=gpr_cv", + "--blacklist-type=gpr_once", + ] - } - ++ } ++ // dependent_library ["feature_list"] + // bindgen-0.57.0 "runtime" + // bitflags-1.2.1 "default" |