Snap for 8050040 from 68ed6c6d0d12b738f6987286b1ae181200ee3a47 to simpleperf-release

Change-Id: I753610676a25cb65542dcf5d778a46904e5688d9

3 files changed, 21 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index fcd5aff..bcdbb1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,8 @@ rust_library {
     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: [
@@ -64,42 +66,8 @@ rust_library {
     shared_libs: ["libz"],
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
         "com.android.virt",
     ],
+    min_sdk_version: "29",
 }
-
-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
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"
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..9b35218 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,12 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.bluetooth",
     "com.android.virt"
   ],
   "dependencies": true,
   "device": true,
+  "min-sdk-version": "29",
   "run": true,
   "tests": true
 }