diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:09 +0000 |
| commit | 0036c79bdee5285d6bd4a4133e0b0c7e83243514 (patch) | |
| tree | 2698aebd852e7389e02c7273889c683676cedfc2 /Android.bp | |
| parent | 61628131676ad018e4be70b433ffb8d0c7232324 (diff) | |
| parent | 495c04d466870c8bef685b4dbf23083aee23c396 (diff) | |
| download | num-traits-0036c79bdee5285d6bd4a4133e0b0c7e83243514.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8d7d16cbea am: fb5cccb2ec am: 6fbe2800f5 am: 495c04d466
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-traits/+/1912693
Change-Id: I5de12eee14993548999a8a5c0d77dd8ba38e1f58
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 49 |
1 files changed, 17 insertions, 32 deletions
@@ -41,6 +41,8 @@ rust_library { name: "libnum_traits", host_supported: true, crate_name: "num_traits", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["src/lib.rs"], edition: "2015", features: [ @@ -60,12 +62,18 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "num-traits_defaults", +rust_test { + name: "num-traits_test_src_lib", + host_supported: true, crate_name: "num_traits", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -77,25 +85,18 @@ rust_defaults { ], } -rust_test_host { - name: "num-traits_host_test_src_lib", - defaults: ["num-traits_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "num-traits_device_test_src_lib", - defaults: ["num-traits_defaults"], -} - -rust_defaults { - name: "num-traits_defaults_cast", + name: "num-traits_test_tests_cast", + host_supported: true, crate_name: "cast", + cargo_env_compat: true, + cargo_pkg_version: "0.2.14", srcs: ["tests/cast.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", features: [ "default", @@ -109,19 +110,3 @@ rust_defaults { "libnum_traits", ], } - -rust_test_host { - name: "num-traits_host_test_tests_cast", - defaults: ["num-traits_defaults_cast"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "num-traits_device_test_tests_cast", - defaults: ["num-traits_defaults_cast"], -} - -// dependent_library ["feature_list"] -// autocfg-1.0.1 |