aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2020-12-04 14:24:24 +0100
committerJeff Vander Stoep <jeffv@google.com>2020-12-04 14:24:24 +0100
commitf06dc5df83682bac66e9551c7a2a22321cd91e40 (patch)
tree35c146bdd1f6066aa551062f92b17f1a6e49aa4c /patches
parent2bbaf7e25f52536b814b46b948e426686bc74c41 (diff)
downloadquiche-f06dc5df83682bac66e9551c7a2a22321cd91e40.tar.gz
Add Android.bp
Apply patch to remove assumption about cargo env variables. Bug: 155855709 Test: mm Change-Id: I1a90f607d34c01c69b60cc71cd22ea8562e505aa
Diffstat (limited to 'patches')
-rw-r--r--patches/env.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/patches/env.diff b/patches/env.diff
new file mode 100644
index 0000000..39629cf
--- /dev/null
+++ b/patches/env.diff
@@ -0,0 +1,16 @@
+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()
+ }
+