aboutsummaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-12-15 16:02:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-15 16:02:27 +0000
commitfb5cccb2ece1951a44ed351f50a5e518e4aec05e (patch)
tree2698aebd852e7389e02c7273889c683676cedfc2 /Android.bp
parentdf64975d3c353c3a8e2aa17fa9de0b3af786d755 (diff)
parent8d7d16cbeab141d8f3412bd1a2a7636c3dc58318 (diff)
downloadnum-traits-fb5cccb2ece1951a44ed351f50a5e518e4aec05e.tar.gz
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8d7d16cbea
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/num-traits/+/1912693 Change-Id: I961f40c20aa8e89794825a5854176a8a9e524960
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp49
1 files changed, 17 insertions, 32 deletions
diff --git a/Android.bp b/Android.bp
index 8bf649d..8cbc204 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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