diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 19:21:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 19:21:07 +0000 |
| commit | 2eb8f40272c26854b4e660764527cc9512dd8e4b (patch) | |
| tree | c21bf542dce657853e94cdde3756433d69bae0d9 | |
| parent | 01c68a61dbf3c33fbada7b552711ff7d295ae2bc (diff) | |
| parent | 81a9eca35b3fe21e76c7adf10dfff251bb265c14 (diff) | |
| download | serde-2eb8f40272c26854b4e660764527cc9512dd8e4b.tar.gz | |
Use new cargo2android no-std flag rather than extra manual block. am: 2112f9de2a am: 81a9eca35b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/2583343
Change-Id: I0b9d397c1e37c4f748328e61f54611548824fbee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | cargo2android.json | 19 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 25 |
3 files changed, 25 insertions, 36 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 { diff --git a/cargo2android.json b/cargo2android.json index 89a0f3e..ed3dae4 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,13 +1,24 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", "cfg-blocklist": [ "std_atomic64" ], "dependencies": true, "device": true, - "features": "default,derive,rc", + "min_sdk_version": "29", "run": true, - "tests": true, "vendor-available": true, - "min_sdk_version": "29" + "variants": [ + { + "features": "default,derive,rc", + "tests": true + }, + { + "alloc": true, + "features": "alloc,derive", + "force-rlib": true, + "no-host": true, + "suffix": "_nostd", + "no-std": true + } + ] } diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp deleted file mode 100644 index d0e88d9..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,25 +0,0 @@ -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", - ], -} |