diff options
author | Jakub Kotur <qtr@google.com> | 2021-03-10 14:23:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 14:23:17 +0000 |
commit | 22208f42badc589bf4907b9671887675008044dd (patch) | |
tree | 9f6371be9a50826bf2dac84f8799c0ed7a61b536 | |
parent | 1011e50743121d418b1da23a7fac0aec0c7c659c (diff) | |
parent | f167c5fc4cf8b8194bea284f8aff1d27a3e49d92 (diff) | |
download | thread_local-22208f42badc589bf4907b9671887675008044dd.tar.gz |
Enable thread_local on the device. am: f167c5fc4c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/1621179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58dd7187e9b414d1b5b44888eadf9d2d8bdd4269
-rw-r--r-- | Android.bp | 64 | ||||
-rw-r--r-- | TEST_MAPPING | 7 |
2 files changed, 26 insertions, 45 deletions
@@ -1,43 +1,9 @@ -// This file is generated by cargo2android.py --run --dependencies --tests. +// This file is generated by cargo2android.py --run --device --dependencies --tests. +// Do not modify this file as changes will be overridden on upgrade. -package { - default_applicable_licenses: ["external_rust_crates_thread_local_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_thread_local_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-MIT", - ], - license_text: [ - "LICENSE-APACHE", - "LICENSE-MIT", - ], -} - -rust_library_host { +rust_library { name: "libthread_local", + host_supported: true, crate_name: "thread_local", srcs: ["src/lib.rs"], edition: "2018", @@ -46,20 +12,30 @@ rust_library_host { ], } -rust_test_host { - name: "thread_local_host_test_src_lib", +rust_defaults { + name: "thread_local_defaults", crate_name: "thread_local", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - test_options: { - unit_test: true, - }, edition: "2018", rustlibs: [ "libonce_cell", ], } +rust_test_host { + name: "thread_local_host_test_src_lib", + defaults: ["thread_local_defaults"], + test_options: { + unit_test: true, + }, +} + +rust_test { + name: "thread_local_device_test_src_lib", + defaults: ["thread_local_defaults"], +} + // dependent_library ["feature_list"] -// once_cell-1.5.2 "alloc,default,std" +// once_cell-1.7.2 "alloc,default,race,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index 6551257..f53788f 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -5,8 +5,13 @@ "name": "keystore2_test" }, { + "name": "thread_local_device_test_src_lib" + }, + { "name": "libsqlite3-sys_device_test_src_lib" + }, + { + "name": "vpnprofilestore_test" } ] } - |