diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-09-28 11:07:11 -0700 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2021-09-28 11:50:05 -0700 |
| commit | 3afa139e822c792fa5bbda138570da94f64eb9d0 (patch) | |
| tree | 4456e3f00564efc326f6d110e0f545e05b735e14 | |
| parent | dacbb99fbda8e9ad2002644e461e4d1d486ae810 (diff) | |
| download | grpcio-sys-3afa139e822c792fa5bbda138570da94f64eb9d0.tar.gz | |
Simplify patch by not passing cargo_pkg_version.
Android.bp.patch will fail during crate upgrades because its context
relies on cargo_pkg_version, which is set automatically and thus will
change on each upgrade. We avoid this by simply not generating
cargo_pkg_version, as the crate does not use CARGO_PKG_VERSION.
We also migrate to a config file while we're here.
Test: None
Change-Id: I7ab01744a089f22dcc26f22e4025307f81ac4bd6
| -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", |