Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 08002afc50

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/1912678

Change-Id: Iff184a14695ffc742e2a87f475e5fec86cf131a9

Android.bp

diff --git a/Android.bp b/Android.bp
index fcd5aff..d4d36fa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,8 @@
     name: "liblibz_sys",
     host_supported: true,
     crate_name: "libz_sys",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.3",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
@@ -67,39 +69,3 @@
         "com.android.virt",
     ],
 }
-
-rust_defaults {
-    name: "libz-sys_defaults",
-    crate_name: "libz_sys",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    features: [
-        "default",
-        "libc",
-        "stock-zlib",
-    ],
-    rustlibs: [
-        "liblibc",
-    ],
-    shared_libs: ["libz"],
-}
-
-rust_test_host {
-    name: "libz-sys_host_test_src_lib",
-    defaults: ["libz-sys_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "libz-sys_device_test_src_lib",
-    defaults: ["libz-sys_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   cc-1.0.68
-//   libc-0.2.97 "default,std"
-//   pkg-config-0.3.19

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 89f3a90..7325ef4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,7 +11,21 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "libz-sys_device_test_src_lib"
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "ZipFuseTest"
+    },
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
     },
     {
       "name": "microdroid_manager_test"

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
   "device": true,
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file