diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-10-08 21:39:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 21:39:41 +0000 |
| commit | f372202805119e6e7315d4a1ee2036a0cbcdf9e7 (patch) | |
| tree | 4456e3f00564efc326f6d110e0f545e05b735e14 | |
| parent | 81b8ab541c26f0e415213af61d80b29d1e36c007 (diff) | |
| parent | dc4394cb8642a0e781dc085ee5609358e27b57d1 (diff) | |
| download | grpcio-sys-f372202805119e6e7315d4a1ee2036a0cbcdf9e7.tar.gz | |
Merge "Simplify patch by not passing cargo_pkg_version." am: ac3fe15122 am: dc4394cb86
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/1838343
Change-Id: Iee5313896c281c69d1bda6e13b36fcfd661540c3
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | cargo2android.json | 8 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --features=default,secure --patch=patches/Android.bp.patch --ignore-cargo-errors. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -39,7 +39,6 @@ rust_library { host_supported: true, crate_name: "grpcio_sys", cargo_env_compat: true, - cargo_pkg_version: "0.9.1+1.38.0", srcs: [ "src/lib.rs", ":libgrpc_bindgen", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 00000000..5edf07b4 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,8 @@ +{ + "device": true, + "features": "default,secure", + "ignore-cargo-errors": true, + "no-pkg-vers": true, + "patch": "patches/Android.bp.patch", + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index 383a606b..3e0977d5 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -3,9 +3,9 @@ index 45707bc..d0369e6 100644 --- a/Android.bp +++ b/Android.bp @@ -40,7 +40,10 @@ + host_supported: true, crate_name: "grpcio_sys", cargo_env_compat: true, - cargo_pkg_version: "0.9.1+1.38.0", - srcs: ["src/lib.rs"], + srcs: [ + "src/lib.rs", |