diff options
author | Joel Galenson <jgalenson@google.com> | 2021-08-24 10:11:42 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-08-24 10:13:23 -0700 |
commit | 92bc79fc38940298be6ce02ab721093c85fa1eeb (patch) | |
tree | 1930298deb2fbf6e7e2b6fef12b2a82ff641657d | |
parent | 2c22405ca1892f0aea3d123d3391034f9a383073 (diff) | |
download | grpcio-sys-92bc79fc38940298be6ce02ab721093c85fa1eeb.tar.gz |
Refresh Android.bp.
Update the patch so it applies.
The updater removes the .gitmodules file.
Test: None
Change-Id: I0cda1ecf8a99964765948a0a65935541939205c8
-rw-r--r-- | Android.bp | 34 | ||||
-rw-r--r-- | grpc/.gitmodules | 51 | ||||
-rw-r--r-- | patches/Android.bp.patch | 18 |
3 files changed, 10 insertions, 93 deletions
@@ -38,6 +38,8 @@ rust_library { name: "libgrpcio_sys", host_supported: true, crate_name: "grpcio_sys", + cargo_env_compat: true, + cargo_pkg_version: "0.9.0+1.38.0", srcs: [ "src/lib.rs", ":libgrpc_bindgen", @@ -103,34 +105,4 @@ rust_bindgen { "--blocklist-type=gpr_cv", "--blocklist-type=gpr_once", ] - } - -// dependent_library ["feature_list"] -// bindgen-0.57.0 "runtime" -// bitflags-1.2.1 "default" -// boringssl-src-0.3.0+688fc5c -// cc-1.0.68 -// cexpr-0.4.0 -// cfg-if-1.0.0 -// clang-sys-1.2.0 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime" -// cmake-0.1.45 -// glob-0.3.0 -// lazy_static-1.4.0 -// lazycell-1.3.0 -// libc-0.2.97 "default,std" -// libloading-0.7.0 -// libz-sys-1.1.3 "libc,static" -// memchr-2.4.0 "std,use_std" -// nom-5.1.2 "alloc,std" -// peeking_take_while-0.1.2 -// pkg-config-0.3.19 -// proc-macro2-1.0.27 -// quote-1.0.9 -// regex-1.5.4 "std,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" -// regex-syntax-0.6.25 "unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" -// rustc-hash-1.1.0 "default,std" -// same-file-1.0.6 -// shlex-0.1.1 -// unicode-xid-0.2.2 "default" -// version_check-0.9.3 -// walkdir-2.3.2 +} diff --git a/grpc/.gitmodules b/grpc/.gitmodules deleted file mode 100644 index 0c5e5435..00000000 --- a/grpc/.gitmodules +++ /dev/null @@ -1,51 +0,0 @@ -[submodule "third_party/zlib"] - path = third_party/zlib - url = https://github.com/madler/zlib - # When using CMake to build, the zlib submodule ends up with a - # generated file that makes Git consider the submodule dirty. This - # state can be ignored for day-to-day development on gRPC. - ignore = dirty -[submodule "third_party/protobuf"] - path = third_party/protobuf - url = https://github.com/google/protobuf.git -[submodule "third_party/googletest"] - path = third_party/googletest - url = https://github.com/google/googletest.git -[submodule "third_party/benchmark"] - path = third_party/benchmark - url = https://github.com/google/benchmark -[submodule "third_party/boringssl-with-bazel"] - path = third_party/boringssl-with-bazel - url = https://github.com/google/boringssl.git -[submodule "third_party/re2"] - path = third_party/re2 - url = https://github.com/google/re2.git -[submodule "third_party/cares/cares"] - path = third_party/cares/cares - url = https://github.com/c-ares/c-ares.git - branch = cares-1_12_0 -[submodule "third_party/bloaty"] - path = third_party/bloaty - url = https://github.com/google/bloaty.git -[submodule "third_party/abseil-cpp"] - path = third_party/abseil-cpp - url = https://github.com/abseil/abseil-cpp.git - branch = lts_2020_02_25 -[submodule "third_party/envoy-api"] - path = third_party/envoy-api - url = https://github.com/envoyproxy/data-plane-api.git -[submodule "third_party/googleapis"] - path = third_party/googleapis - url = https://github.com/googleapis/googleapis.git -[submodule "third_party/protoc-gen-validate"] - path = third_party/protoc-gen-validate - url = https://github.com/envoyproxy/protoc-gen-validate.git -[submodule "third_party/udpa"] - path = third_party/udpa - url = https://github.com/cncf/udpa.git -[submodule "third_party/libuv"] - path = third_party/libuv - url = https://github.com/libuv/libuv.git -[submodule "third_party/opencensus-proto"] - path = third_party/opencensus-proto - url = https://github.com/census-instrumentation/opencensus-proto.git diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index e7d7f1cd..53d50713 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,10 +2,10 @@ diff --git a/Android.bp b/Android.bp index 45707bc..d0369e6 100644 --- a/Android.bp +++ b/Android.bp -@@ -38,7 +38,10 @@ rust_library { - name: "libgrpcio_sys", - host_supported: true, +@@ -40,7 +40,10 @@ crate_name: "grpcio_sys", + cargo_env_compat: true, + cargo_pkg_version: "0.9.0+1.38.0", - srcs: ["src/lib.rs"], + srcs: [ + "src/lib.rs", @@ -14,7 +14,7 @@ index 45707bc..d0369e6 100644 edition: "2018", features: [ "bindgen", -@@ -50,51 +53,58 @@ rust_library { +@@ -52,47 +55,54 @@ "liblibc", "liblibz_sys", ], @@ -80,8 +80,8 @@ index 45707bc..d0369e6 100644 + defaults: ["libgrpcio_sys_defaults"], + host_supported: true, + srcs: ["grpc_wrap.cc"], - } - ++} ++ +rust_bindgen { + name: "libgrpc_bindgen", + defaults: ["libgrpcio_sys_defaults"], @@ -110,8 +110,4 @@ index 45707bc..d0369e6 100644 + "--blocklist-type=gpr_cv", + "--blocklist-type=gpr_once", + ] -+ } -+ - // dependent_library ["feature_list"] - // bindgen-0.57.0 "runtime" - // bitflags-1.2.1 "default" + } |