Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

2 files changed, 19 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index b6d9bf8..02272a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
     name: "libshared_child",
     host_supported: true,
     crate_name: "shared_child",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.5",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -34,30 +36,20 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "shared_child_defaults",
+rust_test {
+    name: "shared_child_test_src_lib",
+    host_supported: true,
     crate_name: "shared_child",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.5",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "liblibc",
     ],
 }
-
-rust_test_host {
-    name: "shared_child_host_test_src_lib",
-    defaults: ["shared_child_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "shared_child_device_test_src_lib",
-    defaults: ["shared_child_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   libc-0.2.94 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 94d2224..078d2ff 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,15 @@
 {
   "presubmit": [
     {
-      "name": "shared_child_device_test_src_lib"
+      "name": "shared_child_test_src_lib"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "shared_child_test_src_lib"
     },
     {
       "name": "virtualizationservice_device_test"