diff options
author | Andrew Walbran <qwandor@google.com> | 2023-05-12 18:40:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 18:40:46 +0000 |
commit | 81a9eca35b3fe21e76c7adf10dfff251bb265c14 (patch) | |
tree | c21bf542dce657853e94cdde3756433d69bae0d9 /Android.bp | |
parent | ecb8b146300db2feba65acb500d1cda3a64f6411 (diff) | |
parent | 2112f9de2a43f92b007dd10000e715108b98d112 (diff) | |
download | serde-81a9eca35b3fe21e76c7adf10dfff251bb265c14.tar.gz |
Use new cargo2android no-std flag rather than extra manual block. am: 2112f9de2a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2583343
Change-Id: Iac0757900468592a7da2dfc928c7c3c0ca2de42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Android.bp')
-rw-r--r-- | Android.bp | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -70,13 +70,6 @@ rust_library_rlib { 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", @@ -87,6 +80,16 @@ rust_library_rlib { "//apex_available:platform", "//apex_available:anyapex", ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "liballoc.rust_sysroot", + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", + ], + product_available: true, + vendor_available: true, + min_sdk_version: "29", } rust_test { |