diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:01:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:01:58 +0000 |
| commit | ab71b0a8ba83545dc247bab78501269e31cc74c1 (patch) | |
| tree | 879d2bd02caa3477ad95271540188e8ab1a8f2fa | |
| parent | d72a6267795a87b4402f4ab7178e2c833b491d43 (diff) | |
| parent | 14a929c58f3510f13c976172faa4e20c0f15a699 (diff) | |
| download | thread_local-ab71b0a8ba83545dc247bab78501269e31cc74c1.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 14a929c58f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/1912835
Change-Id: Ie40cf50f07029162b279f43d70fad19078d09e33
| -rw-r--r-- | Android.bp | 30 | ||||
| -rw-r--r-- | TEST_MAPPING | 7 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 22 insertions, 20 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -41,6 +41,8 @@ rust_library { name: "libthread_local", host_supported: true, crate_name: "thread_local", + cargo_env_compat: true, + cargo_pkg_version: "1.1.3", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -48,30 +50,20 @@ rust_library { ], } -rust_defaults { - name: "thread_local_defaults", +rust_test { + name: "thread_local_test_src_lib", + host_supported: true, crate_name: "thread_local", + cargo_env_compat: true, + cargo_pkg_version: "1.1.3", 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.7.2 "alloc,default,race,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index 478894e..7974396 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,12 @@ { "presubmit": [ { - "name": "thread_local_device_test_src_lib" + "name": "thread_local_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "thread_local_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |