Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Iba479e26901b6145bf9399ba0e819dd140f43c6f

2 files changed, 32 insertions, 88 deletions

diff --git a/Android.bp b/Android.bp
index d97534c..35dfd9f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,6 +24,8 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "xml",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.4",
     srcs: ["src/lib.rs"],
     edition: "2015",
     apex_available: [
@@ -34,9 +36,9 @@ rust_library {
 
 rust_defaults {
     name: "xml-rs_test_defaults",
-    crate_name: "xml_analyze",
-    // has rustc warnings
-    srcs: ["src/analyze.rs"],
+    crate_name: "xml_rs",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.4",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -46,61 +48,11 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "xml-rs_host_test_src_analyze",
-    defaults: ["xml-rs_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "xml-rs_device_test_src_analyze",
+    name: "xml-rs_test_tests_event_reader",
     defaults: ["xml-rs_test_defaults"],
-}
-
-rust_defaults {
-    name: "xml-rs_test_defaults_xml",
-    crate_name: "xml",
-    // has rustc warnings
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    rustlibs: [
-        "liblazy_static",
-    ],
-}
-
-rust_test_host {
-    name: "xml-rs_host_test_src_lib",
-    defaults: ["xml-rs_test_defaults_xml"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "xml-rs_device_test_src_lib",
-    defaults: ["xml-rs_test_defaults_xml"],
-}
-
-rust_defaults {
-    name: "xml-rs_test_defaults_xml_rs",
-    crate_name: "xml_rs",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    rustlibs: [
-        "liblazy_static",
-        "libxml_rust",
-    ],
-}
-
-rust_test_host {
-    name: "xml-rs_host_test_tests_event_reader",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
     // has rustc warnings
+    host_supported: true,
     srcs: ["tests/event_reader.rs"],
     test_options: {
         unit_test: true,
@@ -108,16 +60,10 @@ rust_test_host {
 }
 
 rust_test {
-    name: "xml-rs_device_test_tests_event_reader",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
-    // has rustc warnings
-    srcs: ["tests/event_reader.rs"],
-}
-
-rust_test_host {
-    name: "xml-rs_host_test_tests_event_writer",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
+    name: "xml-rs_test_tests_event_writer",
+    defaults: ["xml-rs_test_defaults"],
     // has rustc warnings
+    host_supported: true,
     srcs: ["tests/event_writer.rs"],
     test_options: {
         unit_test: true,
@@ -126,35 +72,23 @@ rust_test_host {
 }
 
 rust_test {
-    name: "xml-rs_device_test_tests_event_writer",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
-    // has rustc warnings
-    srcs: ["tests/event_writer.rs"],
-    data: ["tests/documents/*"],
-}
-
-rust_test_host {
-    name: "xml-rs_host_test_tests_streaming",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
+    name: "xml-rs_test_tests_streaming",
+    defaults: ["xml-rs_test_defaults"],
     // has rustc warnings
+    host_supported: true,
     srcs: ["tests/streaming.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "xml-rs_device_test_tests_streaming",
-    defaults: ["xml-rs_test_defaults_xml_rs"],
-    // has rustc warnings
-    srcs: ["tests/streaming.rs"],
-}
-
 rust_binary {
     name: "xml_analyze",
     // has rustc warnings
     host_supported: true,
     crate_name: "xml_analyze",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.4",
     srcs: ["src/analyze.rs"],
     edition: "2015",
     rustlibs: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b2c6b9e..9843a12 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,26 +1,36 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/serde-xml-rs"
+    }
+  ],
   "presubmit": [
     {
-      "name": "serde-xml-rs_device_test_src_lib"
+      "name": "virtualizationservice_device_test"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "xml-rs_test_tests_event_reader"
     },
     {
-      "name": "xml-rs_device_test_src_analyze"
+      "name": "xml-rs_test_tests_event_writer"
     },
     {
-      "name": "xml-rs_device_test_src_lib"
+      "name": "xml-rs_test_tests_streaming"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "virtualizationservice_device_test"
     },
     {
-      "name": "xml-rs_device_test_tests_event_reader"
+      "name": "xml-rs_test_tests_event_reader"
     },
     {
-      "name": "xml-rs_device_test_tests_event_writer"
+      "name": "xml-rs_test_tests_event_writer"
     },
     {
-      "name": "xml-rs_device_test_tests_streaming"
+      "name": "xml-rs_test_tests_streaming"
     }
   ]
 }