From 6c7c9a1684d7d6e5355ea84280489e044bcff523 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:04:31 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I9ced66cd88d4aca7f4a7327eba594542990629ad
---
 Android.bp | 49 +++++++++++++++++--------------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

(limited to 'Android.bp')

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
-- 
cgit v1.2.3