Snap for 12313714 from 48f0ebee2b7d5235619610b59234a8b729d9c7ac to 24Q4-release
Change-Id: I03e8240d353f9281281ce644dfbeafd4b69b9855
diff --git a/fastboot/vendor_boot_img_utils_test.cpp b/fastboot/vendor_boot_img_utils_test.cpp
index 467c6e9..8107270 100644
--- a/fastboot/vendor_boot_img_utils_test.cpp
+++ b/fastboot/vendor_boot_img_utils_test.cpp
@@ -163,7 +163,7 @@
protected:
// |rel_path| is the relative path under test data directory.
TestFileHandle(const std::filesystem::path& rel_path)
- : abs_path_(std::move(std::filesystem::path(GetExecutableDirectory()) / rel_path)) {}
+ : abs_path_(std::filesystem::path(GetExecutableDirectory()) / rel_path) {}
// Given |read_fd|, the readonly fd on the test file, return an fd that's suitable for client
// to use. Implementation is responsible for managing the lifetime of the returned fd.
virtual android::base::Result<borrowed_fd> Transform(const std::filesystem::path& abs_path,
diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp
index d85f6ed..d5893de 100644
--- a/shell_and_utilities/Android.bp
+++ b/shell_and_utilities/Android.bp
@@ -18,6 +18,7 @@
"awk",
"bc",
"bzip2",
+ "cpu-target-features",
"fsck.exfat",
"ldd",
"logwrapper",