diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-28 18:49:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-28 18:49:48 +0000 |
| commit | b30b395ef685bae18a566f103b79415cd7e3e9e1 (patch) | |
| tree | fc0e3234f36f26e0d426729db68e694889348a39 | |
| parent | 420ff5d4e4c5bcd7ab8146e3c6f24f3592917a6a (diff) | |
| parent | 83d544573ee3c8a4a67fdbc064a273bd24c0c6d8 (diff) | |
| download | quiche-b30b395ef685bae18a566f103b79415cd7e3e9e1.tar.gz | |
Remove patch which no longer applies. am: b3b7270dc3 am: 83d544573e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256
Change-Id: I15caf25740364acdf887969ed4f294c7814de06b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/env.diff | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/patches/env.diff b/patches/env.diff deleted file mode 100644 index 39629cf..0000000 --- a/patches/env.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/ffi.rs b/src/ffi.rs -index 13d98cd..39564dc 100644 ---- a/src/ffi.rs -+++ b/src/ffi.rs -@@ -42,7 +42,10 @@ use crate::*; - - #[no_mangle] - pub extern fn quiche_version() -> *const u8 { -- static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "\0"); -+ //static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "\0"); -+ // ANDROID's build system doesn't support environment variables -+ // so we hardcode the package version here. -+ static VERSION: &str = concat!("0.6.0", "\0"); - VERSION.as_ptr() - } - |