diff options
| author | Alan Stokes <alanstokes@google.com> | 2023-04-25 15:23:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-25 15:23:15 +0000 |
| commit | ecb8b146300db2feba65acb500d1cda3a64f6411 (patch) | |
| tree | e20d9e63a28336194d5b0911fb192bace5528181 | |
| parent | f6c0d67df5a2df3b9e0fa9f3c374b85a44792c86 (diff) | |
| parent | f7d51f4fa182c7897cb2a53c49563271fdefb6ad (diff) | |
| download | serde-ecb8b146300db2feba65acb500d1cda3a64f6411.tar.gz | |
Create no_std builds of ciborium and dependencies am: f7d51f4fa1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2557331
Change-Id: I1d91a678d88b95d913ffaee54771dc27c5152860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 26 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 25 |
3 files changed, 52 insertions, 4 deletions
@@ -63,6 +63,32 @@ rust_library { min_sdk_version: "29", } +rust_library_rlib { + name: "libserde_nostd", + crate_name: "serde", + cargo_env_compat: true, + cargo_pkg_version: "1.0.152", + srcs: ["src/lib.rs"], + edition: "2015", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + features: [ + "alloc", + "derive", + "serde_derive", + ], + proc_macros: ["libserde_derive"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], +} + rust_test { name: "serde_test_src_lib", host_supported: true, diff --git a/cargo2android.json b/cargo2android.json index 8579ca9..89a0f3e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,8 +1,5 @@ { - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], + "add-toplevel-block": "cargo2android_nostd.bp", "cfg-blocklist": [ "std_atomic64" ], diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp new file mode 100644 index 0000000..d0e88d9 --- /dev/null +++ b/cargo2android_nostd.bp @@ -0,0 +1,25 @@ +rust_library_rlib { + name: "libserde_nostd", + crate_name: "serde", + cargo_env_compat: true, + cargo_pkg_version: "1.0.152", + srcs: ["src/lib.rs"], + edition: "2015", + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + features: [ + "alloc", + "derive", + "serde_derive", + ], + proc_macros: ["libserde_derive"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], +} |