From 9430e80ac4413be1e66c28aca419a3614d9b2086 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 26 May 2022 11:06:02 -0700 Subject: Update TEST_MAPPING Test: None Bug: 233924440 Change-Id: I817b2627f1a5264d328bac9c34d6390a9ae2b6f0 --- TEST_MAPPING | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/TEST_MAPPING b/TEST_MAPPING index 5ef61de..50e4980 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -14,6 +14,20 @@ "path": "external/rust/crates/tokio-test" } ], + "postsubmit": [ + { + "name": "ZipFuseTest" + }, + { + "name": "authfs_device_test_src_lib" + }, + { + "name": "doh_unit_test" + }, + { + "name": "virtualizationservice_device_test" + } + ], "presubmit": [ { "name": "ZipFuseTest" -- cgit v1.2.3 From 5cf4013cb28f8804085a41ee1c02e45b53a909be Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 14 Jun 2022 16:05:25 -0700 Subject: Update TEST_MAPPING Test: None Bug: 236006683 Change-Id: Ide0ebd6d2217f839c70968321beaf0634af10be8 --- TEST_MAPPING | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index 50e4980..5ef61de 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -14,20 +14,6 @@ "path": "external/rust/crates/tokio-test" } ], - "postsubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "doh_unit_test" - }, - { - "name": "virtualizationservice_device_test" - } - ], "presubmit": [ { "name": "ZipFuseTest" -- cgit v1.2.3 From 8adfc8cf4b3a16ed5d0a35235da8e13f27321c7c Mon Sep 17 00:00:00 2001 From: William Escande Date: Mon, 22 Aug 2022 11:27:58 -0700 Subject: [Bluetooth apex] Use new apex name The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: Idfd4b60e816c7cd5cc8d7eb7d979b53ca46971e4 --- Android.bp | 2 +- cargo2android.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index da05036..aa50aa2 100644 --- a/Android.bp +++ b/Android.bp @@ -52,7 +52,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.bluetooth", + "com.android.btservices", "com.android.resolv", "com.android.virt", ], 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" ], -- cgit v1.2.3 From 09499d15ab5c59bf3ff8715effd78f0d5aafbc45 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Mon, 12 Dec 2022 08:11:07 +0100 Subject: Upgrade futures-sink to 0.3.25 This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/futures-sink For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I0a1a95ed4756cdd7e4cdd86519e131e5ff18a134 --- .cargo_vcs_info.json | 2 +- Android.bp | 2 +- Cargo.toml | 3 ++- Cargo.toml.orig | 2 +- METADATA | 12 ++++++++---- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index aa92167..7fc5d9f 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44" + "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3" }, "path_in_vcs": "futures-sink" } \ No newline at end of file diff --git a/Android.bp b/Android.bp index aa50aa2..0cb9e1c 100644 --- a/Android.bp +++ b/Android.bp @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "futures_sink", cargo_env_compat: true, - cargo_pkg_version: "0.3.21", + cargo_pkg_version: "0.3.25", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/Cargo.toml b/Cargo.toml index 2203c38..681281c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,11 +13,12 @@ edition = "2018" rust-version = "1.36" name = "futures-sink" -version = "0.3.21" +version = "0.3.25" description = """ The asynchronous `Sink` trait for the futures-rs 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 2c0685a..cbd4a33 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-sink" -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 27fe835..e9e57cc 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-sink +# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md + name: "futures-sink" description: "The asynchronous `Sink` trait for the futures-rs library." third_party { @@ -7,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate" + value: "https://static.crates.io/crates/futures-sink/futures-sink-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 } } -- cgit v1.2.3 From 7e9535fb740babdaea76d11718cf2b62bb562387 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 23 Jan 2023 13:33:38 +0000 Subject: Update TEST_MAPPING Test: None Change-Id: I3a3d8a4bc173f4d0208dd6b60234e01f5d585d0a --- TEST_MAPPING | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index 5ef61de..0391ca2 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -4,6 +4,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" }, @@ -21,11 +33,26 @@ { "name": "authfs_device_test_src_lib" }, + { + "name": "bluetooth_with_facades.test" + }, { "name": "doh_unit_test" }, { - "name": "virtualizationservice_device_test" + "name": "keystore2_legacy_blobs_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libpvmfw_avb.integration_test" + }, + { + "name": "virtualizationmanager_device_test" } ], "presubmit-rust": [ @@ -35,11 +62,26 @@ { "name": "authfs_device_test_src_lib" }, + { + "name": "bluetooth_with_facades.test" + }, { "name": "doh_unit_test" }, { - "name": "virtualizationservice_device_test" + "name": "keystore2_legacy_blobs_test" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "libpvmfw_avb.integration_test" + }, + { + "name": "virtualizationmanager_device_test" } ] } -- cgit v1.2.3 From ea1f02504b6d10c2fff784f1591f9a2b57e0e2bf Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Mon, 30 Jan 2023 11:35:07 +0100 Subject: Update TEST_MAPPING Test: atest Change-Id: If38dacb1ea1532cb68e991708f1265d3dc6195e8 --- TEST_MAPPING | 52 ++++++---------------------------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index 0391ca2..3a6d2f1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -24,64 +24,24 @@ }, { "path": "external/rust/crates/tokio-test" - } - ], - "presubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "bluetooth_with_facades.test" - }, - { - "name": "doh_unit_test" - }, - { - "name": "keystore2_legacy_blobs_test" - }, - { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_test" - }, - { - "name": "libpvmfw_avb.integration_test" - }, - { - "name": "virtualizationmanager_device_test" - } - ], - "presubmit-rust": [ - { - "name": "ZipFuseTest" - }, - { - "name": "authfs_device_test_src_lib" - }, - { - "name": "bluetooth_with_facades.test" }, { - "name": "doh_unit_test" + "path": "packages/modules/DnsResolver" }, { - "name": "keystore2_legacy_blobs_test" + "path": "packages/modules/Virtualization/authfs" }, { - "name": "keystore2_test" + "path": "packages/modules/Virtualization/virtualizationmanager" }, { - "name": "legacykeystore_test" + "path": "packages/modules/Virtualization/zipfuse" }, { - "name": "libpvmfw_avb.integration_test" + "path": "system/security/keystore2" }, { - "name": "virtualizationmanager_device_test" + "path": "system/security/keystore2/legacykeystore" } ] } -- cgit v1.2.3 From 03433bff1e11ae6759ae5734eb2836a84aec8144 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Wed, 15 Feb 2023 20:21:58 +0100 Subject: Upgrade futures-sink to 0.3.26 This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update rust/crates/futures-sink For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: I00066eb93996a8dbbadd33144583f27d3f0571e7 --- .cargo_vcs_info.json | 2 +- Android.bp | 2 +- Cargo.toml | 2 +- Cargo.toml.orig | 2 +- METADATA | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 7fc5d9f..b1601b5 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3" + "sha1": "5e3693a350f96244151081d2c030208cd15f9572" }, "path_in_vcs": "futures-sink" } \ No newline at end of file diff --git a/Android.bp b/Android.bp index 0cb9e1c..af8f5a9 100644 --- a/Android.bp +++ b/Android.bp @@ -42,7 +42,7 @@ rust_library { host_supported: true, crate_name: "futures_sink", cargo_env_compat: true, - cargo_pkg_version: "0.3.25", + cargo_pkg_version: "0.3.26", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/Cargo.toml b/Cargo.toml index 681281c..0efe922 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.36" name = "futures-sink" -version = "0.3.25" +version = "0.3.26" description = """ The asynchronous `Sink` trait for the futures-rs library. """ diff --git a/Cargo.toml.orig b/Cargo.toml.orig index cbd4a33..29174ac 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" edition = "2018" rust-version = "1.36" license = "MIT OR Apache-2.0" diff --git a/METADATA b/METADATA index e9e57cc..05dca55 100644 --- a/METADATA +++ b/METADATA @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.25.crate" + value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.26.crate" } - version: "0.3.25" + version: "0.3.26" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 12 - day: 12 + year: 2023 + month: 2 + day: 15 } } -- cgit v1.2.3 From 80e76f48dd008a6036817e72360ea821f32c0c31 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 7 Mar 2023 17:23:55 -0800 Subject: Make futures-sink available to product and vendor Bug: 270690570 Test: mma in external/rust/crates Change-Id: Ie00832674aa28dc810ca15ced976b86a6b00abb3 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index af8f5a9..e394f70 100644 --- a/Android.bp +++ b/Android.bp @@ -56,5 +56,7 @@ rust_library { "com.android.resolv", "com.android.virt", ], + product_available: true, + vendor_available: true, min_sdk_version: "29", } -- cgit v1.2.3