Replace base string utils with android::base ones
Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5
diff --git a/payload_consumer/delta_performer_integration_test.cc b/payload_consumer/delta_performer_integration_test.cc
index 3dfd12a..fe3121b 100644
--- a/payload_consumer/delta_performer_integration_test.cc
+++ b/payload_consumer/delta_performer_integration_test.cc
@@ -25,7 +25,6 @@
#include <base/files/file_path.h>
#include <base/files/file_util.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <gmock/gmock-matchers.h>
#include <google/protobuf/repeated_field.h>
@@ -252,7 +251,8 @@
signature_size_strings.push_back(
android::base::StringPrintf("%zu", signature_size));
}
- string signature_size_string = base::JoinString(signature_size_strings, ":");
+ string signature_size_string =
+ android::base::Join(signature_size_strings, ":");
ScopedTempFile hash_file("hash.XXXXXX"), metadata_hash_file("hash.XXXXXX");
string delta_generator_path = GetBuildArtifactsPath("delta_generator");
@@ -289,9 +289,9 @@
metadata_signature));
metadata_sig_file_paths.push_back(metadata_sig_files.back().path());
}
- string sig_files_string = base::JoinString(sig_file_paths, ":");
+ string sig_files_string = android::base::Join(sig_file_paths, ":");
string metadata_sig_files_string =
- base::JoinString(metadata_sig_file_paths, ":");
+ android::base::Join(metadata_sig_file_paths, ":");
// Add the signature to the payload.
ASSERT_EQ(
diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 0e29ddf..d2b8bcd 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -29,7 +29,6 @@
#include <base/files/file_path.h>
#include <base/files/file_util.h>
#include <base/files/scoped_temp_dir.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <brillo/secure_blob.h>
#include <gmock/gmock.h>
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 4990358..8c21673 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -31,7 +31,6 @@
#include <utility>
#include <base/bind.h>
-#include <base/strings/string_util.h>
#include <brillo/data_encoding.h>
#include <brillo/message_loops/message_loop.h>
#include <brillo/secure_blob.h>
@@ -357,8 +356,8 @@
if (partition_index_ == install_plan_.partitions.size()) {
if (!install_plan_.untouched_dynamic_partitions.empty()) {
LOG(INFO) << "Verifying extents of untouched dynamic partitions ["
- << base::JoinString(install_plan_.untouched_dynamic_partitions,
- ", ")
+ << android::base::Join(
+ install_plan_.untouched_dynamic_partitions, ", ")
<< "]";
if (!dynamic_control_->VerifyExtentsForUntouchedPartitions(
install_plan_.source_slot,
diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 58558f9..b55dea1 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -22,7 +22,6 @@
#include <base/format_macros.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include "update_engine/common/utils.h"
@@ -36,7 +35,7 @@
namespace {
string PayloadUrlsToString(
const decltype(InstallPlan::Payload::payload_urls)& payload_urls) {
- return "(" + base::JoinString(payload_urls, ",") + ")";
+ return "(" + android::base::Join(payload_urls, ",") + ")";
}
string VectorToString(const vector<std::pair<string, string>>& input,
@@ -46,9 +45,10 @@
input.end(),
std::back_inserter(vec),
[](const auto& pair) {
- return base::JoinString({pair.first, pair.second}, ": ");
+ return android::base::Join(vector{pair.first, pair.second},
+ ": ");
});
- return base::JoinString(vec, separator);
+ return android::base::Join(vec, separator);
}
} // namespace
@@ -81,8 +81,7 @@
string InstallPlan::ToString() const {
string url_str = download_url;
- if (base::StartsWith(
- url_str, "fd://", base::CompareCase::INSENSITIVE_ASCII)) {
+ if (android::base::StartsWith(ToLower(url_str), "fd://")) {
int fd = std::stoi(url_str.substr(strlen("fd://")));
url_str = utils::GetFilePath(fd);
}
@@ -145,7 +144,7 @@
"\n "));
}
- return base::JoinString(result_str, "\n");
+ return android::base::Join(result_str, "\n");
}
bool InstallPlan::LoadPartitionsFromSlots(BootControlInterface* boot_control) {
diff --git a/payload_consumer/partition_writer.cc b/payload_consumer/partition_writer.cc
index a415100..17763ea 100644
--- a/payload_consumer/partition_writer.cc
+++ b/payload_consumer/partition_writer.cc
@@ -29,7 +29,6 @@
#include <vector>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include "update_engine/common/error_code.h"
@@ -333,7 +332,7 @@
static_cast<uint64_t>(ext.num_blocks())));
}
LOG(ERROR) << "Operation source (offset:size) in blocks: "
- << base::JoinString(source_extents, ",");
+ << android::base::Join(source_extents, ",");
// Log remount history if this device is an ext4 partition.
LogMountHistory(source_fd);
diff --git a/payload_consumer/postinstall_runner_action.cc b/payload_consumer/postinstall_runner_action.cc
index aaa8a43..02417be 100644
--- a/payload_consumer/postinstall_runner_action.cc
+++ b/payload_consumer/postinstall_runner_action.cc
@@ -31,7 +31,6 @@
#include <base/files/file_util.h>
#include <base/logging.h>
#include <base/strings/string_split.h>
-#include <base/strings/string_util.h>
#include "update_engine/common/action_processor.h"
#include "update_engine/common/boot_control_interface.h"
diff --git a/payload_consumer/postinstall_runner_action_unittest.cc b/payload_consumer/postinstall_runner_action_unittest.cc
index 38985dc..9eab1c1 100644
--- a/payload_consumer/postinstall_runner_action_unittest.cc
+++ b/payload_consumer/postinstall_runner_action_unittest.cc
@@ -29,7 +29,6 @@
#if BASE_VER < 780000 // Android
#include <base/message_loop/message_loop.h>
#endif // BASE_VER < 780000
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#if BASE_VER >= 780000 // CrOS
#include <base/task/single_thread_task_executor.h>
diff --git a/payload_consumer/verified_source_fd.cc b/payload_consumer/verified_source_fd.cc
index ad3a0ef..addf534 100644
--- a/payload_consumer/verified_source_fd.cc
+++ b/payload_consumer/verified_source_fd.cc
@@ -23,7 +23,6 @@
#include <vector>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include "update_engine/common/error_code.h"