diff options
author | Jeffrey Vander Stoep <jeffv@google.com> | 2020-12-07 18:05:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-07 18:05:28 +0000 |
commit | 9bb75e143b7efb2c65484ccd3ca233d5242064ee (patch) | |
tree | c27e514ef344ac0dde0763b35e961a31af334042 | |
parent | b92f5a908b610f1ff4916b8ace7cb40949a166c5 (diff) | |
parent | 4a3a1c0677ed68a7dfc5516e91b74abf5ec134b5 (diff) | |
download | quiche-9bb75e143b7efb2c65484ccd3ca233d5242064ee.tar.gz |
Revert "Add Android.bp" am: 4a3a1c0677
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1518541
Change-Id: Ib74198b6374cfd993856f2eec771778fa9894620
-rw-r--r-- | Android.bp | 39 | ||||
-rw-r--r-- | patches/env.diff | 16 | ||||
-rw-r--r-- | src/ffi.rs | 5 |
3 files changed, 1 insertions, 59 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index 9e84e00..0000000 --- a/Android.bp +++ /dev/null @@ -1,39 +0,0 @@ -// This file is generated by cargo2android.py --run --device --dependencies. - - -rust_library { - name: "libquiche", - host_supported: true, - crate_name: "quiche", - srcs: ["src/lib.rs"], - edition: "2018", - features: [ - "boringssl", - "default", - ], - rustlibs: [ - "liblazy_static", - "liblibc", - "liblibm", - "liblog_rust", - "libring", - ], - shared_libs: [ - "libcrypto", - "libssl", - ], -} - - -// dependent_library ["feature_list"] -// cc-1.0.65 -// cfg-if-0.1.10 -// cmake-0.1.45 -// lazy_static-1.4.0 -// libc-0.2.80 "default,std" -// libm-0.2.1 "default" -// log-0.4.11 "std" -// once_cell-1.5.2 "alloc,std" -// ring-0.16.17 "alloc,default,dev_urandom_fallback,once_cell" -// spin-0.5.2 -// untrusted-0.7.1 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() - } - @@ -42,10 +42,7 @@ use crate::*; #[no_mangle] pub extern fn quiche_version() -> *const u8 { - //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"); + static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "\0"); VERSION.as_ptr() } |