diff options
author | Haibo Huang <hhb@google.com> | 2021-01-05 17:16:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-05 17:16:24 +0000 |
commit | 897c72e7fd0dab5911c91df616dff1d60248877f (patch) | |
tree | dec2a9cc604c7b5c08c9088bf8d444808d9ce320 | |
parent | 556d03ac6e029c660ef4f0f746f4ecbe446b687b (diff) | |
parent | de76d84f1f13a558f40b2fa8b5e68b886498119d (diff) | |
download | grpcio-sys-897c72e7fd0dab5911c91df616dff1d60248877f.tar.gz |
Upgrade rust/crates/grpcio-sys to 0.7.2 am: ae54389e17 am: de76d84f1f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1533723
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I016640fee7a8638e093a15e8b62f35cb4e7a530b
-rw-r--r-- | .cargo_vcs_info.json | 5 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | build.rs | 4 |
6 files changed, 11 insertions, 14 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json deleted file mode 100644 index 90abfbc5..00000000 --- a/.cargo_vcs_info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "git": { - "sha1": "19a53b5cc9612511dabb365dae05286e807668e5" - } -} @@ -74,14 +74,14 @@ rust_bindgen { // bindgen-0.51.1 // bitflags-1.2.1 "default" // boringssl-src-0.1.0 -// cc-1.0.63 +// cc-1.0.66 // cexpr-0.3.6 // cfg-if-0.1.10 // clang-sys-0.28.1 "clang_6_0,gte_clang_3_6,gte_clang_3_7,gte_clang_3_8,gte_clang_3_9,gte_clang_4_0,gte_clang_5_0,gte_clang_6_0,libloading,runtime" // cmake-0.1.45 // glob-0.3.0 // lazy_static-1.4.0 -// libc-0.2.80 "default,std" +// libc-0.2.81 "default,std" // libloading-0.5.2 // libz-sys-1.1.2 "default,libc,static,stock-zlib" // memchr-2.3.4 "default,std,use_std" @@ -13,7 +13,7 @@ [package] edition = "2018" name = "grpcio-sys" -version = "0.7.1" +version = "0.7.2" authors = ["The TiKV Project Developers"] build = "build.rs" exclude = ["grpc/doc/*", "grpc/etc/*", "grpc/examples/*", "grpc/Makefile", "grpc/templates/*", "grpc/src/android/*", "grpc/src/csharp/*", "grpc/src/node/*", "grpc/src/objective-c/*", "grpc/src/php/*", "grpc/src/python/*", "grpc/src/ruby/*", "grpc/test/core/end2end/*", "grpc/third_party/zlib/*", "grpc/third_party/abseil-cpp/absl/time/internal/cctz/testdata", "grpc/third_party/benchmark/*", "grpc/third_party/bloaty/*", "grpc/third_party/boringssl-with-bazel/*", "grpc/third_party/libuv/*", "grpc/third_party/gflags/*", "grpc/third_party/googletest/*", "grpc/third_party/objective_c/*", "grpc/third_party/protobuf/*", "grpc/third_party/toolchans/*", "grpc/third_party/envoy-api/*", "grpc/third_party/googleapis/*", "grpc/third_party/protoc-gen-validate/*", "grpc/third_party/udpa/*", "grpc/tools/run_tests/generated/*", "grpc/test/core/", "!grpc/test/core/security/*.cc", "!grpc/test/core/util/cmdline.cc", "grpc/test/cpp"] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 3071e0a4..c6b816f9 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "grpcio-sys" -version = "0.7.1" +version = "0.7.2" authors = ["The TiKV Project Developers"] license = "Apache-2.0" keywords = ["grpc", "bindings"] @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/grpcio-sys/grpcio-sys-0.6.0.crate" + value: "https://static.crates.io/crates/grpcio-sys/grpcio-sys-0.7.2.crate" } - version: "0.6.0" + version: "0.7.2" license_type: NOTICE last_upgrade_date { year: 2020 - month: 10 - day: 14 + month: 12 + day: 18 } } @@ -75,7 +75,9 @@ fn build_grpc(cc: &mut cc::Build, library: &str) { println!("cargo:rustc-link-lib=framework=CoreFoundation"); } - if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" { + if let Some(val) = get_env("CXX") { + config.define("CMAKE_CXX_COMPILER", val); + } else if env::var("CARGO_CFG_TARGET_ENV").unwrap() == "musl" { config.define("CMAKE_CXX_COMPILER", "g++"); } |