diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2020-11-19 19:03:52 +0100 |
|---|---|---|
| committer | Jeff Vander Stoep <jeffv@google.com> | 2020-11-23 12:00:30 +0100 |
| commit | 08902cf05eddf53e0ba8ccd8a4b12d615d3445e3 (patch) | |
| tree | 780528631811bd11e8ff44b3c485e8ee2b1972f9 /patches/Android.bp.patch | |
| parent | 98a8525e013e1356d5914fbf7a20a142bdc96f7b (diff) | |
| download | grpcio-sys-08902cf05eddf53e0ba8ccd8a4b12d615d3445e3.tar.gz | |
Upgrade to 0.7.1
Test: build, TH
Change-Id: I3cb2c39b931e2b5c5b1a0bf775c6185c0e521da8
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 16c5f03e..8cbc574a 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,6 +1,8 @@ ---- Android.bp 2020-10-30 19:20:08.709277813 -0700 -+++ Android.bp 2020-10-30 19:17:57.837789872 -0700 -@@ -4,7 +4,10 @@ +diff --git a/Android.bp b/Android.bp +index 40ed7bc..12928a0 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -4,7 +4,10 @@ rust_library { name: "libgrpcio_sys", host_supported: true, crate_name: "grpcio_sys", @@ -12,22 +14,37 @@ edition: "2018", features: [ "default", -@@ -14,32 +17,57 @@ +@@ -14,48 +17,56 @@ rust_library { "liblibc", "liblibz_sys", ], - static_libs: [ - "libabsl_bad_optional_access", +- "libabsl_bad_variant_access", - "libabsl_base", +- "libabsl_city", - "libabsl_civil_time", +- "libabsl_cord", +- "libabsl_debugging_internal", +- "libabsl_demangle_internal", - "libabsl_dynamic_annotations", +- "libabsl_exponential_biased", +- "libabsl_graphcycles_internal", +- "libabsl_hash", +- "libabsl_hashtablez_sampler", - "libabsl_int128", - "libabsl_log_severity", +- "libabsl_malloc_internal", +- "libabsl_raw_hash_set", - "libabsl_raw_logging_internal", - "libabsl_spinlock_wait", +- "libabsl_stacktrace", +- "libabsl_status", - "libabsl_str_format_internal", - "libabsl_strings", - "libabsl_strings_internal", +- "libabsl_symbolize", +- "libabsl_synchronization", - "libabsl_throw_delegate", - "libabsl_time", - "libabsl_time_zone", @@ -37,21 +54,22 @@ - "libgpr", - "libgrpc", - "libgrpc_wrap", +- "libre2", - "libssl", - "libupb", - "libz", + 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++"], +} @@ -76,7 +94,6 @@ + "--default-enum-style rust", + "--whitelist-function=\\bgrpc_.*", + "--whitelist-function=\\bgpr_.*", -+ "--whitelist-function=gpr_inf_future", + "--whitelist-function=\\bgrpcwrap_.*", + "--whitelist-var=\\bGRPC_.*", + "--whitelist-type=\\bgrpc_.*", |