Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8e2a6930e6 am: ef9e3de755 am: ff5e96edda

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pin-utils/+/1912505

Change-Id: Id9fc91596f67c04606aa00b2b3a4e3670ac55775

1 files changed, 12 insertions, 40 deletions

diff --git a/Android.bp b/Android.bp
index 846786d..2b63f27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ rust_library {
     name: "libpin_utils",
     host_supported: true,
     crate_name: "pin_utils",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     apex_available: [
@@ -52,30 +54,10 @@ rust_library {
 }
 
 rust_defaults {
-    name: "pin-utils_defaults",
-    crate_name: "pin_utils",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-}
-
-rust_test_host {
-    name: "pin-utils_host_test_src_lib",
-    defaults: ["pin-utils_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "pin-utils_device_test_src_lib",
-    defaults: ["pin-utils_defaults"],
-}
-
-rust_defaults {
-    name: "pin-utils_defaults_pin_utils",
+    name: "pin-utils_test_defaults",
     crate_name: "pin_utils",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -84,9 +66,10 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "pin-utils_host_test_tests_projection",
-    defaults: ["pin-utils_defaults_pin_utils"],
+rust_test {
+    name: "pin-utils_test_tests_projection",
+    defaults: ["pin-utils_test_defaults"],
+    host_supported: true,
     srcs: ["tests/projection.rs"],
     test_options: {
         unit_test: true,
@@ -94,22 +77,11 @@ rust_test_host {
 }
 
 rust_test {
-    name: "pin-utils_device_test_tests_projection",
-    defaults: ["pin-utils_defaults_pin_utils"],
-    srcs: ["tests/projection.rs"],
-}
-
-rust_test_host {
-    name: "pin-utils_host_test_tests_stack_pin",
-    defaults: ["pin-utils_defaults_pin_utils"],
+    name: "pin-utils_test_tests_stack_pin",
+    defaults: ["pin-utils_test_defaults"],
+    host_supported: true,
     srcs: ["tests/stack_pin.rs"],
     test_options: {
         unit_test: true,
     },
 }
-
-rust_test {
-    name: "pin-utils_device_test_tests_stack_pin",
-    defaults: ["pin-utils_defaults_pin_utils"],
-    srcs: ["tests/stack_pin.rs"],
-}