Upgrade rust/crates/grpcio-sys to 0.9.1+1.38.0 am: dacbb99fbd am: e1a47e9dea am: 81b8ab541c am: 48f02b92e7 am: 23dc9ee66e

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1835353

Change-Id: I37349b4bfba9e1f8ace84770026981f30018f16e

7 files changed, 23 insertions, 14 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 2587a953..4f6a2220 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "7a48e0bb843e702832c1c3ac024c468dedf0023c"
+    "sha1": "61a60923255fe618589bf03ece46fff097b8cb43"
   }
 }
diff --git a/Android.bp b/Android.bp
index d1009b16..1afd37b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --features=default,secure --dependencies --patch=patches/Android.bp.patch --ignore-cargo-errors.
+// This file is generated by cargo2android.py --run --device --features=default,secure --patch=patches/Android.bp.patch --ignore-cargo-errors.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -39,7 +39,7 @@ rust_library {
     host_supported: true,
     crate_name: "grpcio_sys",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.9.0+1.38.0",
+    cargo_pkg_version: "0.9.1+1.38.0",
     srcs: [
         "src/lib.rs",
         ":libgrpc_bindgen",
@@ -47,6 +47,7 @@ rust_library {
     edition: "2018",
     features: [
         "bindgen",
+        "boringssl-src",
         "default",
         "secure",
         "use-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 7dc8a0c8..e6892c8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "grpcio-sys"
-version = "0.9.0+1.38.0"
+version = "0.9.1+1.38.0"
 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"]
@@ -44,6 +44,7 @@ default-features = false
 
 [build-dependencies.boringssl-src]
 version = "0.3.0"
+optional = true
 
 [build-dependencies.cc]
 version = "1.0"
@@ -62,5 +63,5 @@ default = ["use-bindgen"]
 no-omit-frame-pointer = []
 openssl = ["secure"]
 openssl-vendored = ["openssl", "openssl-sys"]
-secure = []
+secure = ["boringssl-src"]
 use-bindgen = ["bindgen"]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 4b4e16ac..7a520ef4 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "grpcio-sys"
-version = "0.9.0+1.38.0"
+version = "0.9.1+1.38.0"
 authors = ["The TiKV Project Developers"]
 license = "Apache-2.0"
 keywords = ["grpc", "bindings"]
@@ -54,7 +54,7 @@ libz-sys = { version = "1.1.3", default-features = false, features = ["libc", "s
 
 [features]
 default = ["use-bindgen"]
-secure = []
+secure = ["boringssl-src"]
 openssl = ["secure"]
 openssl-vendored = ["openssl", "openssl-sys"]
 no-omit-frame-pointer = []
@@ -70,4 +70,4 @@ pkg-config = "0.3"
 walkdir = "2.2.9"
 # Because of rust-lang/cargo#5237, bindgen should not be upgraded util a minor or major release.
 bindgen = { version = "0.57.0", default-features = false, optional = true, features = ["runtime"] }
-boringssl-src = "0.3.0"
+boringssl-src = { version = "0.3.0", optional = true }
diff --git a/METADATA b/METADATA
index 213b4479..a7622dee 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/grpcio-sys/grpcio-sys-0.9.0+1.38.0.crate"
+    value: "https://static.crates.io/crates/grpcio-sys/grpcio-sys-0.9.1+1.38.0.crate"
   }
-  version: "0.9.0+1.38.0"
+  version: "0.9.1+1.38.0"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 6
-    day: 21
+    month: 9
+    day: 23
   }
 }
diff --git a/build.rs b/build.rs
index c7179886..7f045083 100644
--- a/build.rs
+++ b/build.rs
@@ -172,7 +172,13 @@ fn build_grpc(cc: &mut cc::Build, library: &str) {
         config.define("gRPC_BUILD_CODEGEN", "false");
         // We don't need to build benchmarks.
         config.define("gRPC_BENCHMARK_PROVIDER", "none");
-        config.define("gRPC_SSL_PROVIDER", "package");
+
+        // `package` should only be set for secure feature, otherwise cmake will always search for
+        // ssl library.
+        if cfg!(feature = "secure") {
+            config.define("gRPC_SSL_PROVIDER", "package");
+        }
+        #[cfg(feature = "secure")]
         if cfg!(feature = "openssl") {
             if cfg!(feature = "openssl-vendored") {
                 config.register_dep("openssl");
@@ -254,6 +260,7 @@ fn figure_ssl_path(build_dir: &str) {
     println!("cargo:rustc-link-lib=crypto");
 }
 
+#[cfg(feature = "secure")]
 fn build_boringssl(config: &mut CmakeConfig) {
     let boringssl_artifact = boringssl_src::Build::new().build();
     config.define(
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 77a9291a..383a606b 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -5,7 +5,7 @@ index 45707bc..d0369e6 100644
 @@ -40,7 +40,10 @@
      crate_name: "grpcio_sys",
      cargo_env_compat: true,
-     cargo_pkg_version: "0.9.0+1.38.0",
+     cargo_pkg_version: "0.9.1+1.38.0",
 -    srcs: ["src/lib.rs"],
 +    srcs: [
 +        "src/lib.rs",