diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 20:29:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 20:29:11 +0000 |
| commit | f583cfdf21c58101ef1ae2ad6b452bf0ae883513 (patch) | |
| tree | 7b27ed82de6c291c67cae2d32fa106a41bbcba04 | |
| parent | 5d0652826f336324bbeef4147c9aee6a4f6811d1 (diff) | |
| parent | 3b5819b8e85445cf1ef81a878effe1f14e587d4c (diff) | |
| download | log-f583cfdf21c58101ef1ae2ad6b452bf0ae883513.tar.gz | |
Use new no-std flag to cargo2android. am: 0069504377 am: 1a36a6a8e1 am: 3b5819b8e8
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/2587045
Change-Id: Ibd7459cf73d180529f95e56f0affec16a8b787f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | cargo2android.json | 14 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 21 |
3 files changed, 17 insertions, 32 deletions
@@ -62,9 +62,8 @@ rust_library { min_sdk_version: "29", } -rust_library { +rust_library_rlib { name: "liblog_rust_nostd", - host_supported: true, crate_name: "log", cargo_env_compat: true, cargo_pkg_version: "0.4.17", @@ -79,8 +78,15 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.virt", + "//apex_available:anyapex", + ], + prefer_rlib: true, + no_stdlibs: true, + stdlibs: [ + "libcompiler_builtins.rust_sysroot", + "libcore.rust_sysroot", ], + product_available: true, + vendor_available: true, min_sdk_version: "29", } - diff --git a/cargo2android.json b/cargo2android.json index f145d4c..474419b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,18 +1,18 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], "dependencies": true, "device": true, - "features": "std", "min-sdk-version": "29", "run": true, - "vendor-available": true, "variants": [ { + "features": "std", "suffix": "_rust" + }, + { + "force-rlib": true, + "no-host": true, + "suffix": "_rust_nostd", + "no-std": true } ] }
\ No newline at end of file diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp deleted file mode 100644 index e5ead1f..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,21 +0,0 @@ -rust_library { - name: "liblog_rust_nostd", - host_supported: true, - crate_name: "log", - cargo_env_compat: true, - cargo_pkg_version: "0.4.17", - srcs: ["src/lib.rs"], - edition: "2015", - cfgs: [ - "atomic_cas", - "has_atomics", - ], - rustlibs: [ - "libcfg_if", - ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], - min_sdk_version: "29", -} |