Regenerate Android.bp with new cargo2android.pyandroid-r-beta-3android-r-beta-2

Test: make
Change-Id: Icde65b4ebce66b2461dfae5b5ad12f129be7e503

2 files changed, 36 insertions, 44 deletions

diff --git a/Android.bp b/Android.bp
index a51668d..2c05f48 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,4 @@
-// This file is generated by cargo2android.py --run --device --test.
-// Manually split host and device tests,
-// and link in static libraries for device tests.
+// This file is generated by cargo2android.py --run --device --test --dependencies.
 
 rust_library {
     name: "libpin_utils",
@@ -11,62 +9,56 @@ rust_library {
 }
 
 rust_defaults {
-    name: "pin-utils_tests",
+    name: "pin-utils_defaults",
     crate_name: "pin_utils",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
-    rustlibs: [
-        "libpin_utils",
-    ],
 }
 
 rust_test_host {
-    name: "pin-utils_host_tests_stack_pin",
-    defaults: ["pin-utils_tests"],
-    srcs: [
-        "tests/stack_pin.rs",
-    ],
+    name: "pin-utils_host_test_src_lib",
+    defaults: ["pin-utils_defaults"],
+    srcs: ["src/lib.rs"],
 }
 
 rust_test {
-    name: "pin-utils_device_tests_stack_pin",
-    defaults: ["pin-utils_tests"],
-    srcs: [
-        "tests/stack_pin.rs",
+    name: "pin-utils_device_test_src_lib",
+    defaults: ["pin-utils_defaults"],
+    srcs: ["src/lib.rs"],
+}
+
+rust_defaults {
+    name: "pin-utils_defaults1",
+    crate_name: "pin_utils",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libpin_utils",
     ],
 }
 
 rust_test_host {
-    name: "pin-utils_host_tests_projection",
-    defaults: ["pin-utils_tests"],
-    srcs: [
-        "tests/projection.rs",
-    ],
+    name: "pin-utils_host_test_tests_projection",
+    defaults: ["pin-utils_defaults1"],
+    srcs: ["tests/projection.rs"],
 }
 
 rust_test {
-    name: "pin-utils_device_tests_projection",
-    defaults: ["pin-utils_tests"],
-    srcs: [
-        "tests/projection.rs",
-    ],
+    name: "pin-utils_device_test_tests_projection",
+    defaults: ["pin-utils_defaults1"],
+    srcs: ["tests/projection.rs"],
 }
 
 rust_test_host {
-    name: "pin-utils_host_tests_pin_utils",
-    crate_name: "pin_utils",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
+    name: "pin-utils_host_test_tests_stack_pin",
+    defaults: ["pin-utils_defaults1"],
+    srcs: ["tests/stack_pin.rs"],
 }
 
 rust_test {
-    name: "pin-utils_device_tests_pin_utils",
-    crate_name: "pin_utils",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
+    name: "pin-utils_device_test_tests_stack_pin",
+    defaults: ["pin-utils_defaults1"],
+    srcs: ["tests/stack_pin.rs"],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index dc91f3a..86a462b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,24 +1,24 @@
 {
   "presubmit": [
     {
-      "name": "pin-utils_device_tests_projection"
+      "name": "pin-utils_device_test_tests_projection"
     },
     {
-      "name": "pin-utils_host_tests_projection",
+      "name": "pin-utils_host_test_tests_projection",
       "host": true
     },
     {
-      "name": "pin-utils_device_tests_stack_pin"
+      "name": "pin-utils_device_test_tests_stack_pin"
     },
     {
-      "name": "pin-utils_host_tests_stack_pin",
+      "name": "pin-utils_host_test_tests_stack_pin",
       "host": true
     },
     {
-      "name": "pin-utils_device_tests_pin_utils"
+      "name": "pin-utils_device_test_src_lib"
     },
     {
-      "name": "pin-utils_host_tests_pin_utils",
+      "name": "pin-utils_host_test_src_lib",
       "host": true
     }
   ]