diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-11 23:28:01 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-11 23:28:01 +0000 |
commit | 534c290db34ef129a38d1a61464312596f16d10d (patch) | |
tree | e20d9e63a28336194d5b0911fb192bace5528181 | |
parent | 280271836a3e55ced78056deb08119910dde8d3b (diff) | |
parent | aba717c00f2d40ca5e858fe9259669bb1ee79e0e (diff) | |
download | serde-android14-security-release.tar.gz |
Snap for 10113759 from aba717c00f2d40ca5e858fe9259669bb1ee79e0e to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: Ic5c5d911b95ee7a01148942668a782b811968444
-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", + ], +} |