Snap for 9652768 from 2ddde70bebdbe602eb42a6669898294e77d150e1 to simpleperf-release

Change-Id: I8832f2d07041760556b432cd450b33ee530cb1be

7 files changed, 210 insertions, 53 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 0fdfbee..bfa7c9d 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "37252dd33556edd52eebf6c07c194941e7a4ca4c"
+    "sha1": "8431d9e0c0fdaea16c4643c723631223802b2c86"
   },
   "path_in_vcs": ""
 }
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index d52dddd..48e47ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,7 @@ rust_test {
     name: "flate2_test_src_lib",
     crate_name: "flate2",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.24",
+    cargo_pkg_version: "1.0.25",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
@@ -66,7 +66,7 @@ rust_defaults {
     name: "flate2_test_defaults",
     crate_name: "flate2",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.24",
+    cargo_pkg_version: "1.0.25",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -132,7 +132,7 @@ rust_library {
     host_supported: true,
     crate_name: "flate2",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.24",
+    cargo_pkg_version: "1.0.25",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
diff --git a/Cargo.lock.saved b/Cargo.lock.saved
new file mode 100644
index 0000000..5389eec
--- /dev/null
+++ b/Cargo.lock.saved
@@ -0,0 +1,173 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "cc"
+version = "1.0.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cloudflare-zlib-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2040b6d1edfee6d75f172d81e2d2a7807534f3f294ce18184c70e7bb0105cd6f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.25"
+dependencies = [
+ "cloudflare-zlib-sys",
+ "crc32fast",
+ "libz-ng-sys",
+ "libz-sys",
+ "miniz_oxide",
+ "quickcheck",
+ "rand",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.137"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+
+[[package]]
+name = "libz-ng-sys"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4399ae96a9966bf581e726de86969f803a81b7ce795fcd5480e640589457e0f2"
+dependencies = [
+ "cmake",
+ "libc",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+dependencies = [
+ "cc",
+ "cmake",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "quickcheck"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
diff --git a/Cargo.toml b/Cargo.toml
index 23b8b80..68516e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "flate2"
-version = "1.0.24"
+version = "1.0.25"
 authors = [
     "Alex Crichton <alex@alexcrichton.com>",
     "Josh Triplett <josh@joshtriplett.org>",
@@ -56,7 +56,8 @@ optional = true
 default-features = false
 
 [dependencies.miniz_oxide]
-version = "0.5.0"
+version = "0.6.0"
+features = ["with-alloc"]
 optional = true
 default-features = false
 
@@ -90,5 +91,6 @@ zlib-ng-compat = [
 ]
 
 [target."cfg(all(target_arch = \"wasm32\", not(target_os = \"emscripten\")))".dependencies.miniz_oxide]
-version = "0.5.0"
+version = "0.6.0"
+features = ["with-alloc"]
 default-features = false
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index fdb2eb4..aa9a4fc 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
 [package]
 name = "flate2"
 authors = ["Alex Crichton <alex@alexcrichton.com>", "Josh Triplett <josh@joshtriplett.org>"]
-version = "1.0.24"
+version = "1.0.25"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
@@ -20,11 +20,11 @@ and raw deflate streams.
 libz-sys = { version = "1.1.8", optional = true, default-features = false }
 libz-ng-sys = { version = "1.1.8", optional = true }
 cloudflare-zlib-sys = { version = "0.3.0", optional = true }
-miniz_oxide = { version = "0.5.0", optional = true, default-features = false }
+miniz_oxide = { version = "0.6.0", optional = true, default-features = false, features = ["with-alloc"] }
 crc32fast = "1.2.0"
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
-miniz_oxide = { version = "0.5.0", default-features = false }
+miniz_oxide = { version = "0.6.0", default-features = false, features = ["with-alloc"] }
 
 [dev-dependencies]
 rand = "0.8"
diff --git a/METADATA b/METADATA
index b5f57d5..e110f3a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/flate2
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
 name: "flate2"
 description: "DEFLATE compression and decompression exposed as Read/BufRead/Write streams. Supports miniz_oxide, miniz.c, and multiple zlib implementations. Supports zlib, gzip, and raw deflate streams."
 third_party {
@@ -7,13 +11,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/flate2/flate2-1.0.24.crate"
+    value: "https://static.crates.io/crates/flate2/flate2-1.0.25.crate"
   }
-  version: "1.0.24"
+  version: "1.0.25"
   license_type: NOTICE
   last_upgrade_date {
     year: 2022
-    month: 6
-    day: 1
+    month: 12
+    day: 9
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 44f5170..7608707 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,51 +1,50 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "flate2_test_src_lib"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "flate2_test_tests_early-flush"
+      "path": "packages/modules/Virtualization/libs/apexutil"
     },
     {
-      "name": "flate2_test_tests_empty-read"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "flate2_test_tests_gunzip"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "flate2_test_tests_zero-write"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "libapexutil_rust.test"
-    },
+      "path": "packages/modules/Virtualization/zipfuse"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "libapkverify.integration_test"
+      "name": "flate2_test_src_lib"
     },
     {
-      "name": "libapkverify.test"
+      "name": "flate2_test_tests_early-flush"
     },
     {
-      "name": "libidsig.test"
+      "name": "flate2_test_tests_empty-read"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "flate2_test_tests_gunzip"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "flate2_test_tests_zero-write"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
       "name": "flate2_test_src_lib"
     },
     {
@@ -59,27 +58,6 @@
     },
     {
       "name": "flate2_test_tests_zero-write"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "libapexutil_rust.test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }