diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:02 +0000 |
commit | c1066ccbe026fba30a9c65710e88e836778a838e (patch) | |
tree | e84a3b6a52868280c403bde1b00a2510bb7326fc | |
parent | 49f03034ab3120cfb0fff51efa9169921d6d7fc7 (diff) | |
parent | ff70a69fd0d79f0353967092a3aeb3df5bebec7e (diff) | |
download | futures-core-android14-mainline-permission-release.tar.gz |
Snap for 10453563 from ff70a69fd0d79f0353967092a3aeb3df5bebec7e to mainline-permission-releaseaml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release
Change-Id: I6d9ba1e0a362dc20646a5494ba0d30e8849a9f83
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | Cargo.toml | 8 | ||||
-rw-r--r-- | Cargo.toml.orig | 3 | ||||
-rw-r--r-- | METADATA | 14 | ||||
-rw-r--r-- | TEST_MAPPING | 34 | ||||
-rw-r--r-- | cargo2android.json | 2 | ||||
-rw-r--r-- | no_atomic_cas.rs | 4 | ||||
-rw-r--r-- | src/task/__internal/atomic_waker.rs | 11 |
9 files changed, 54 insertions, 30 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 724f674..2de4b01 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44" + "sha1": "5e3693a350f96244151081d2c030208cd15f9572" }, "path_in_vcs": "futures-core" }
\ No newline at end of file @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "futures_core", cargo_env_compat: true, - cargo_pkg_version: "0.3.21", + cargo_pkg_version: "0.3.26", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -52,9 +52,11 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.resolv", "com.android.virt", ], + product_available: true, + vendor_available: true, min_sdk_version: "29", } @@ -13,11 +13,12 @@ edition = "2018" rust-version = "1.36" name = "futures-core" -version = "0.3.21" +version = "0.3.26" description = """ The core traits and types in for the `futures` library. """ homepage = "https://rust-lang.github.io/futures-rs" +readme = "README.md" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" @@ -28,7 +29,10 @@ rustdoc-args = [ "docsrs", ] -[dependencies] +[dependencies.portable-atomic] +version = "1" +optional = true +default-features = false [dev-dependencies] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 4a360f8..5b78edc 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-core" -version = "0.3.21" +version = "0.3.26" edition = "2018" rust-version = "1.36" license = "MIT OR Apache-2.0" @@ -21,6 +21,7 @@ unstable = [] cfg-target-has-atomic = [] [dependencies] +portable-atomic = { version = "1", default-features = false, optional = true } [dev-dependencies] futures = { path = "../futures" } @@ -1,3 +1,7 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update rust/crates/futures-core +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "futures-core" description: "The core traits and types in for the `futures` library." third_party { @@ -7,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate" + value: "https://static.crates.io/crates/futures-core/futures-core-0.3.26.crate" } - version: "0.3.21" + version: "0.3.26" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 3 - day: 1 + year: 2023 + month: 2 + day: 15 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index 5ef61de..3a6d2f1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,6 +5,18 @@ "path": "external/rust/crates/anyhow" }, { + "path": "external/rust/crates/async-stream" + }, + { + "path": "external/rust/crates/futures-channel" + }, + { + "path": "external/rust/crates/futures-executor" + }, + { + "path": "external/rust/crates/futures-test" + }, + { "path": "external/rust/crates/futures-util" }, { @@ -12,34 +24,24 @@ }, { "path": "external/rust/crates/tokio-test" - } - ], - "presubmit": [ - { - "name": "ZipFuseTest" }, { - "name": "authfs_device_test_src_lib" + "path": "packages/modules/DnsResolver" }, { - "name": "doh_unit_test" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "virtualizationservice_device_test" - } - ], - "presubmit-rust": [ - { - "name": "ZipFuseTest" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "authfs_device_test_src_lib" + "path": "packages/modules/Virtualization/zipfuse" }, { - "name": "doh_unit_test" + "path": "system/security/keystore2" }, { - "name": "virtualizationservice_device_test" + "path": "system/security/keystore2/legacykeystore" } ] } diff --git a/cargo2android.json b/cargo2android.json index 5b266a6..b98d10b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,7 +1,7 @@ { "apex-available": [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.resolv", "com.android.virt" ], diff --git a/no_atomic_cas.rs b/no_atomic_cas.rs index 9b05d4b..16ec628 100644 --- a/no_atomic_cas.rs +++ b/no_atomic_cas.rs @@ -2,12 +2,16 @@ // It is not intended for manual editing. const NO_ATOMIC_CAS: &[&str] = &[ + "armv4t-none-eabi", + "armv5te-none-eabi", "avr-unknown-gnu-atmega328", "bpfeb-unknown-none", "bpfel-unknown-none", "msp430-none-elf", "riscv32i-unknown-none-elf", + "riscv32im-unknown-none-elf", "riscv32imc-unknown-none-elf", "thumbv4t-none-eabi", + "thumbv5te-none-eabi", "thumbv6m-none-eabi", ]; diff --git a/src/task/__internal/atomic_waker.rs b/src/task/__internal/atomic_waker.rs index d49d043..0677e83 100644 --- a/src/task/__internal/atomic_waker.rs +++ b/src/task/__internal/atomic_waker.rs @@ -1,9 +1,16 @@ use core::cell::UnsafeCell; use core::fmt; -use core::sync::atomic::AtomicUsize; -use core::sync::atomic::Ordering::{AcqRel, Acquire, Release}; use core::task::Waker; +use atomic::AtomicUsize; +use atomic::Ordering::{AcqRel, Acquire, Release}; + +#[cfg(feature = "portable-atomic")] +use portable_atomic as atomic; + +#[cfg(not(feature = "portable-atomic"))] +use core::sync::atomic; + /// A synchronization primitive for task wakeup. /// /// Sometimes the task interested in a given event will change over time. |