diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:49 +0000 |
commit | 473c56b36ea92a06b8071aaab83caf282a801650 (patch) | |
tree | e9112ccc69532822871b7fd658743d57d914dcbb | |
parent | cd3f7e1a8482242557aa9d5c1528e850801032e6 (diff) | |
parent | 4866e5e41879bc02c743113fe4eb9a2bf6021ea6 (diff) | |
download | libm-473c56b36ea92a06b8071aaab83caf282a801650.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f179e1ccbe am: 76cd8448f5 am: 4866e5e418
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libm/+/1912438
Change-Id: Icd127216ccafcc6f63e191ee02547d534a413c82
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 14 |
2 files changed, 19 insertions, 18 deletions
@@ -54,28 +54,19 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "libm_test_defaults", +rust_test { + name: "libm_test_src_lib", + host_supported: true, crate_name: "libm", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.2.1", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", - features: ["default"], - proc_macros: ["libno_panic"], -} - -rust_test_host { - name: "libm_host_test_src_lib", - defaults: ["libm_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "libm_device_test_src_lib", - defaults: ["libm_test_defaults"], + edition: "2018", + features: ["default"], + proc_macros: ["libno_panic"], } diff --git a/TEST_MAPPING b/TEST_MAPPING index 99842b9..bfdf123 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,14 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + } + ], "presubmit": [ { "name": "doh_unit_test" }, { - "name": "libm_device_test_src_lib" + "name": "libm_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "doh_unit_test" }, { - "name": "quiche_device_test_src_lib" + "name": "libm_test_src_lib" } ] } |