diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-01-26 16:52:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-26 16:52:24 +0000 |
| commit | 38cdaee7d3566979c3c60ca5b1cc55af0ec73569 (patch) | |
| tree | 40930db113a0e7aef0585ffee2a044ec81ea8ca2 | |
| parent | 34625dcc6b1cb8f0f260958114bafa5fc9be1b20 (diff) | |
| parent | c8a4c2bd8c90c615ab6255137666fc0a7d4078f7 (diff) | |
| download | once_cell-38cdaee7d3566979c3c60ca5b1cc55af0ec73569.tar.gz | |
Add no_std version of the library. am: 56e24e25f1 am: c8a4c2bd8c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/once_cell/+/2401113
Change-Id: I24bd9870931539713b448fb02452bb2ca9a5ab94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 32 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 47 |
3 files changed, 74 insertions, 10 deletions
@@ -42,9 +42,9 @@ rust_library { host_supported: true, crate_name: "once_cell", cargo_env_compat: true, - cargo_pkg_version: "1.10.0", + cargo_pkg_version: "1.16.0", srcs: ["src/lib.rs"], - edition: "2018", + edition: "2021", features: [ "alloc", "default", @@ -53,6 +53,26 @@ rust_library { ], apex_available: [ "//apex_available:platform", + "//apex_available:anyapex", + ], + vendor_available: true, + min_sdk_version: "29", +} + +rust_library_rlib { + name: "libonce_cell_nostd", + crate_name: "once_cell", + cargo_env_compat: true, + cargo_pkg_version: "1.16.0", + srcs: ["src/lib.rs"], + edition: "2021", + features: [ + "alloc", + "default", + "race", + ], + apex_available: [ + "//apex_available:platform", "//apex_available:anyapex" ], vendor_available: true, @@ -64,14 +84,14 @@ rust_test { host_supported: true, crate_name: "once_cell", cargo_env_compat: true, - cargo_pkg_version: "1.10.0", + cargo_pkg_version: "1.16.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, test_options: { unit_test: true, }, - edition: "2018", + edition: "2021", features: [ "alloc", "default", @@ -90,14 +110,14 @@ rust_test { host_supported: true, crate_name: "it", cargo_env_compat: true, - cargo_pkg_version: "1.10.0", + cargo_pkg_version: "1.16.0", srcs: ["tests/it.rs"], test_suites: ["general-tests"], auto_gen_config: true, test_options: { unit_test: true, }, - edition: "2018", + edition: "2021", features: [ "alloc", "default", diff --git a/cargo2android.json b/cargo2android.json index c789f3b..674f610 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,11 +1,8 @@ { - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], "dependencies": true, "device": true, "min-sdk-version": "29", + "patch": "patches/Android.bp.patch", "run": true, "tests": true, "vendor-available": true diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..6dee374 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,47 @@ +diff --git a/Android.bp b/Android.bp +index d6878ec..59ae682 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -59,6 +59,26 @@ rust_library { + min_sdk_version: "29", + } + ++rust_library_rlib { ++ name: "libonce_cell_nostd", ++ crate_name: "once_cell", ++ cargo_env_compat: true, ++ cargo_pkg_version: "1.16.0", ++ srcs: ["src/lib.rs"], ++ edition: "2021", ++ features: [ ++ "alloc", ++ "default", ++ "race", ++ ], ++ apex_available: [ ++ "//apex_available:platform", ++ "//apex_available:anyapex" ++ ], ++ vendor_available: true, ++ min_sdk_version: "29", ++} ++ + rust_test { + name: "once_cell_test_src_lib", + host_supported: true, +@@ -79,7 +99,6 @@ rust_test { + "std", + ], + rustlibs: [ +- "libcritical_section", + "libcrossbeam_utils", + "liblazy_static", + "libregex", +@@ -106,7 +125,6 @@ rust_test { + "std", + ], + rustlibs: [ +- "libcritical_section", + "libcrossbeam_utils", + "liblazy_static", + "libonce_cell", |