Snap for 10453563 from cc13e3a5c5da161bfb996c487b7aa436d2060412 to mainline-mediaprovider-releaseaml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000android14-mainline-mediaprovider-release

Change-Id: I2eccccd3a227355f99589e9c9efb2e0369f2ea65

7 files changed, 54 insertions, 47 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index e6ee0e5..4da2d23 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "4b1e1d655d05c9da29aa833ce705feedb3da760b"
+    "sha1": "325fd94cf15c0abfcc5b4631993b48abcf0f1cf1"
   },
   "path_in_vcs": "utils-simd/ppv-lite86"
 }
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index eb5d6df..71f8f5b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@ rust_library {
     host_supported: true,
     crate_name: "ppv_lite86",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.2.16",
+    cargo_pkg_version: "0.2.17",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -53,6 +53,7 @@ rust_library {
         "//apex_available:platform",
         "com.android.virt",
     ],
+    product_available: true,
     vendor_available: true,
 }
 
@@ -61,7 +62,7 @@ rust_test {
     host_supported: true,
     crate_name: "ppv_lite86",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.2.16",
+    cargo_pkg_version: "0.2.17",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
diff --git a/Cargo.toml b/Cargo.toml
index 927ecfe..4b5b14e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,11 +12,18 @@
 [package]
 edition = "2018"
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 authors = ["The CryptoCorrosion Contributors"]
 description = "Implementation of the crypto-simd API for x86"
-keywords = ["crypto", "simd", "x86"]
-categories = ["cryptography", "no-std"]
+keywords = [
+    "crypto",
+    "simd",
+    "x86",
+]
+categories = [
+    "cryptography",
+    "no-std",
+]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/cryptocorrosion/cryptocorrosion"
 
@@ -27,5 +34,6 @@ default = ["std"]
 no_simd = []
 simd = []
 std = []
+
 [badges.travis-ci]
 repository = "cryptocorrosion/cryptocorrosion"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index b457f54..a4497f8 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 authors = ["The CryptoCorrosion Contributors"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -18,4 +18,4 @@ travis-ci = { repository = "cryptocorrosion/cryptocorrosion" }
 default = ["std"]
 std = []
 simd = [] # deprecated
-no_simd = [] # for weird platforms like "x86_64 without SSE2"
+no_simd = []
diff --git a/METADATA b/METADATA
index 95596fd..ecc14e6 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/ppv-lite86
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
 name: "ppv-lite86"
 description: "Implementation of the crypto-simd API for x86"
 third_party {
@@ -7,13 +11,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.16.crate"
+    value: "https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate"
   }
-  version: "0.2.16"
+  version: "0.2.17"
   license_type: NOTICE
   last_upgrade_date {
     year: 2022
-    month: 3
-    day: 1
+    month: 12
+    day: 19
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f0d135a..656d29d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -23,6 +23,12 @@
       "path": "external/rust/crates/crossbeam-utils"
     },
     {
+      "path": "external/rust/crates/flate2"
+    },
+    {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
       "path": "external/rust/crates/mio"
     },
     {
@@ -39,64 +45,52 @@
     },
     {
       "path": "external/rust/crates/tokio"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/zerocopy"
     },
     {
-      "name": "keystore2_test"
+      "path": "external/uwb/src"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "ppv-lite86_test_src_lib"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
+  "presubmit": [
     {
       "name": "ppv-lite86_test_src_lib"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "virtualizationservice_device_test"
+      "name": "ppv-lite86_test_src_lib"
     }
   ]
 }
diff --git a/src/lib.rs b/src/lib.rs
index a4fbabe..1bc27e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,14 +12,14 @@ mod soft;
 mod types;
 pub use self::types::*;
 
-#[cfg(all(target_arch = "x86_64", not(feature = "no_simd"), not(miri)))]
+#[cfg(all(target_arch = "x86_64", target_feature = "sse2", not(feature = "no_simd"), not(miri)))]
 pub mod x86_64;
-#[cfg(all(target_arch = "x86_64", not(feature = "no_simd"), not(miri)))]
+#[cfg(all(target_arch = "x86_64", target_feature = "sse2", not(feature = "no_simd"), not(miri)))]
 use self::x86_64 as arch;
 
-#[cfg(any(feature = "no_simd", miri, not(target_arch = "x86_64")))]
+#[cfg(any(feature = "no_simd", miri, not(target_arch = "x86_64"), all(target_arch = "x86_64", not(target_feature = "sse2"))))]
 pub mod generic;
-#[cfg(any(feature = "no_simd", miri, not(target_arch = "x86_64")))]
+#[cfg(any(feature = "no_simd", miri, not(target_arch = "x86_64"), all(target_arch = "x86_64", not(target_feature = "sse2"))))]
 use self::generic as arch;
 
 pub use self::arch::{vec128_storage, vec256_storage, vec512_storage};