Merge SP1A.210425.001
Change-Id: Ibc48b59bcb9ebc41ee57ad3fd95985d584d106e2
diff --git a/Android.bp b/Android.bp
index 1e13618..ec4c075 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,43 @@
+package {
+ default_applicable_licenses: ["external_rust_crates_rand_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_crates_rand_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "COPYRIGHT",
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
rust_library {
name: "librand",
host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2637267..2eda41d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,49 +5,46 @@
"name": "crossbeam-epoch_device_test_src_lib"
},
{
- "name": "keystore2_test"
+ "name": "crossbeam-epoch_device_test_tests_loom"
},
{
- "name": "tokio_device_test_tests_async_send_sync"
+ "name": "crossbeam-utils_device_test_src_lib"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_atomic_cell"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_cache_padded"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_parker"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_sharded_lock"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_thread"
+ },
+ {
+ "name": "crossbeam-utils_device_test_tests_wait_group"
+ },
+ {
+ "name": "keystore2_test"
},
{
"name": "tokio_device_test_tests_buffered"
},
{
- "name": "tokio_device_test_tests_fs"
- },
- {
- "name": "tokio_device_test_tests_fs_copy"
- },
- {
- "name": "tokio_device_test_tests_fs_dir"
- },
- {
"name": "tokio_device_test_tests_fs_file"
},
{
- "name": "tokio_device_test_tests_fs_file_mocked"
- },
- {
"name": "tokio_device_test_tests_fs_link"
},
{
- "name": "tokio_device_test_tests_io_async_fd"
- },
- {
"name": "tokio_device_test_tests_io_async_read"
},
{
- "name": "tokio_device_test_tests_io_chain"
- },
- {
- "name": "tokio_device_test_tests_io_copy"
- },
- {
- "name": "tokio_device_test_tests_io_driver"
- },
- {
- "name": "tokio_device_test_tests_io_driver_drop"
+ "name": "tokio_device_test_tests_io_copy_bidirectional"
},
{
"name": "tokio_device_test_tests_io_lines"
@@ -62,24 +59,9 @@
"name": "tokio_device_test_tests_io_read_buf"
},
{
- "name": "tokio_device_test_tests_io_read_exact"
- },
- {
- "name": "tokio_device_test_tests_io_read_line"
- },
- {
"name": "tokio_device_test_tests_io_read_to_end"
},
{
- "name": "tokio_device_test_tests_io_read_to_string"
- },
- {
- "name": "tokio_device_test_tests_io_read_until"
- },
- {
- "name": "tokio_device_test_tests_io_split"
- },
- {
"name": "tokio_device_test_tests_io_take"
},
{
@@ -98,24 +80,6 @@
"name": "tokio_device_test_tests_macros_join"
},
{
- "name": "tokio_device_test_tests_macros_pin"
- },
- {
- "name": "tokio_device_test_tests_macros_select"
- },
- {
- "name": "tokio_device_test_tests_macros_test"
- },
- {
- "name": "tokio_device_test_tests_macros_try_join"
- },
- {
- "name": "tokio_device_test_tests_net_bind_resource"
- },
- {
- "name": "tokio_device_test_tests_net_lookup_host"
- },
- {
"name": "tokio_device_test_tests_no_rt"
},
{
@@ -125,27 +89,18 @@
"name": "tokio_device_test_tests_process_issue_42"
},
{
- "name": "tokio_device_test_tests_process_kill_on_drop"
- },
- {
"name": "tokio_device_test_tests_process_smoke"
},
{
"name": "tokio_device_test_tests_rt_basic"
},
{
- "name": "tokio_device_test_tests_rt_common"
- },
- {
"name": "tokio_device_test_tests_rt_threaded"
},
{
"name": "tokio_device_test_tests_signal_ctrl_c"
},
{
- "name": "tokio_device_test_tests_signal_drop_recv"
- },
- {
"name": "tokio_device_test_tests_signal_drop_rt"
},
{
@@ -164,9 +119,6 @@
"name": "tokio_device_test_tests_signal_twice"
},
{
- "name": "tokio_device_test_tests_signal_usr1"
- },
- {
"name": "tokio_device_test_tests_sync_barrier"
},
{
@@ -179,36 +131,18 @@
"name": "tokio_device_test_tests_sync_mpsc"
},
{
- "name": "tokio_device_test_tests_sync_mutex"
- },
- {
"name": "tokio_device_test_tests_sync_mutex_owned"
},
{
- "name": "tokio_device_test_tests_sync_notify"
- },
- {
- "name": "tokio_device_test_tests_sync_oneshot"
+ "name": "tokio_device_test_tests_sync_once_cell"
},
{
"name": "tokio_device_test_tests_sync_rwlock"
},
{
- "name": "tokio_device_test_tests_sync_semaphore"
- },
- {
- "name": "tokio_device_test_tests_sync_semaphore_owned"
- },
- {
"name": "tokio_device_test_tests_sync_watch"
},
{
- "name": "tokio_device_test_tests_task_abort"
- },
- {
- "name": "tokio_device_test_tests_task_blocking"
- },
- {
"name": "tokio_device_test_tests_task_local"
},
{
@@ -218,43 +152,22 @@
"name": "tokio_device_test_tests_tcp_accept"
},
{
- "name": "tokio_device_test_tests_tcp_connect"
- },
- {
"name": "tokio_device_test_tests_tcp_echo"
},
{
- "name": "tokio_device_test_tests_tcp_into_split"
- },
- {
"name": "tokio_device_test_tests_tcp_into_std"
},
{
- "name": "tokio_device_test_tests_tcp_peek"
- },
- {
"name": "tokio_device_test_tests_tcp_shutdown"
},
{
- "name": "tokio_device_test_tests_tcp_socket"
+ "name": "tokio_device_test_tests_time_interval"
},
{
- "name": "tokio_device_test_tests_tcp_split"
+ "name": "tokio_device_test_tests_time_rt"
},
{
- "name": "tokio_device_test_tests_tcp_stream"
- },
- {
- "name": "tokio_device_test_tests_test_clock"
- },
- {
- "name": "tokio_device_test_tests_udp"
- },
- {
- "name": "tokio_device_test_tests_uds_cred"
- },
- {
- "name": "tokio_device_test_tests_uds_datagram"
+ "name": "tokio_device_test_tests_time_timeout"
},
{
"name": "tokio_device_test_tests_uds_split"