diff options
author | Matthew Maurer <mmaurer@google.com> | 2023-03-31 04:20:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-31 04:20:43 +0000 |
commit | 17514045b0e1002a1b0a4361ab214a3b543aa27a (patch) | |
tree | 8ee4368671e25b710612e898eaa5aee5a41be2d6 | |
parent | a0206646305c7105e98eaa059de5ddbc9a8b9a55 (diff) | |
parent | 06b17d6da2cea7b5c0729417f04bc18c95ab7917 (diff) | |
download | static_assertions-17514045b0e1002a1b0a4361ab214a3b543aa27a.tar.gz |
Remove rlib restriction am: fe7b4bbcd8 am: 97593b5bdd am: 51aa57afe5 am: 6353fcad0c am: 06b17d6da2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/static_assertions/+/2514612
Change-Id: Ia726f1a20b730d35dbd2af010262db5a55275e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | cargo2android.json | 1 | ||||
-rw-r--r-- | patches/dylib-std.patch | 14 | ||||
-rw-r--r-- | src/lib.rs | 3 |
4 files changed, 18 insertions, 2 deletions
@@ -20,7 +20,7 @@ license { ], } -rust_library_rlib { +rust_library { name: "libstatic_assertions", host_supported: true, crate_name: "static_assertions", diff --git a/cargo2android.json b/cargo2android.json index f41bf78..ac5389c 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,6 +1,5 @@ { "device": true, - "force-rlib": true, "no_pkg_vers": true, "min-sdk-version": "29", "vendor-available": true, diff --git a/patches/dylib-std.patch b/patches/dylib-std.patch new file mode 100644 index 0000000..7864526 --- /dev/null +++ b/patches/dylib-std.patch @@ -0,0 +1,14 @@ +diff --git a/src/lib.rs b/src/lib.rs +index aa7e227..df47529 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -101,6 +101,9 @@ + )] + #![no_std] + ++#[cfg(android_dylib)] ++extern crate std; ++ + #[cfg(feature = "proc_static_assertions")] + extern crate proc_static_assertions; + #[cfg(feature = "proc_static_assertions")] @@ -101,6 +101,9 @@ )] #![no_std] +#[cfg(android_dylib)] +extern crate std; + #[cfg(feature = "proc_static_assertions")] extern crate proc_static_assertions; #[cfg(feature = "proc_static_assertions")] |