commit c6492d83892748d777926d956daa41196634b32b
author Jeffrey Vander Stoep <jeffv@google.com> Tue Dec 08 21:31:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 08 21:31:51 2020 +0000
tree 35c146bdd1f6066aa551062f92b17f1a6e49aa4c
parent 9bb75e143b7efb2c65484ccd3ca233d5242064ee
parent d802ab86791a1559b8fa8ea090a957d3580be04e

Revert "Revert "Add Android.bp"" am: d802ab8679

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1520700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba6b5256457a33fb40434049ae6cfdfdb1b64e21

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9e84e00
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,39 @@
+// 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

patches/env.diff

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()
+ }
+ 

src/ffi.rs

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 @@
 
 #[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()
 }