Snap for 9550355 from 25df0f8ea727f14460d3ba4c95d567a8074ff8ec to sdk-release
Change-Id: Ieb824fe02bf8f25813b0fd854270e9203216d32d
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 724f674..e178fd2 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44"
+ "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3"
},
"path_in_vcs": "futures-core"
}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 898123d..5a1f3eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@
host_supported: true,
crate_name: "futures_core",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.21",
+ cargo_pkg_version: "0.3.25",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -52,7 +52,7 @@
],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
"com.android.resolv",
"com.android.virt",
],
diff --git a/Cargo.toml b/Cargo.toml
index 32fedcb..7a88a12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,12 @@
edition = "2018"
rust-version = "1.36"
name = "futures-core"
-version = "0.3.21"
+version = "0.3.25"
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"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 4a360f8..f80c1a4 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "futures-core"
-version = "0.3.21"
+version = "0.3.25"
edition = "2018"
rust-version = "1.36"
license = "MIT OR Apache-2.0"
diff --git a/METADATA b/METADATA
index 6829297..4f241b8 100644
--- a/METADATA
+++ b/METADATA
@@ -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 @@
}
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.25.crate"
}
- version: "0.3.21"
+ version: "0.3.25"
license_type: NOTICE
last_upgrade_date {
year: 2022
- month: 3
- day: 1
+ month: 12
+ day: 12
}
}
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",
];
