Replace chrome string util with android base ones
Replaces <base/stringutils.h> with <android-base/stringutils.h>
Replaces base::StringPrintf with android::base::StringPrintf
This change is very mechanical, no change in program behavior only
library functions are being replaced.
Test: th
Change-Id: Ie5797a27ea3cdd3ff537216dc39dffeac052565e
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 519ec71..0b4a13e 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -33,7 +33,7 @@
#include <base/format_macros.h>
#include <base/metrics/histogram_macros.h>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <base/time/time.h>
#include <brillo/data_encoding.h>
#include <bsdiff/bspatch.h>
@@ -89,7 +89,7 @@
if (num_total_operations_) {
total_operations_str = std::to_string(num_total_operations_);
// Upcasting to 64-bit to avoid overflow, back to size_t for formatting.
- completed_percentage_str = base::StringPrintf(
+ completed_percentage_str = android::base::StringPrintf(
" (%" PRIu64 "%%)",
IntRatio(next_operation_num_, num_total_operations_, 100));
}
@@ -101,7 +101,7 @@
if (payload_size) {
payload_size_str = std::to_string(payload_size);
// Upcasting to 64-bit to avoid overflow, back to size_t for formatting.
- downloaded_percentage_str = base::StringPrintf(
+ downloaded_percentage_str = android::base::StringPrintf(
" (%" PRIu64 "%%)", IntRatio(total_bytes_received_, payload_size, 100));
}
@@ -998,7 +998,8 @@
uint64_t this_length =
min(full_length - length,
static_cast<uint64_t>(extent.num_blocks()) * block_size);
- ret += base::StringPrintf("%" PRIi64 ":%" PRIu64 ",", start, this_length);
+ ret += android::base::StringPrintf(
+ "%" PRIi64 ":%" PRIu64 ",", start, this_length);
length += this_length;
}
TEST_AND_RETURN_FALSE(length == full_length);
diff --git a/payload_consumer/delta_performer_integration_test.cc b/payload_consumer/delta_performer_integration_test.cc
index e765f54..3dfd12a 100644
--- a/payload_consumer/delta_performer_integration_test.cc
+++ b/payload_consumer/delta_performer_integration_test.cc
@@ -16,7 +16,6 @@
#include "update_engine/payload_consumer/delta_performer.h"
-#include <inttypes.h>
#include <sys/mount.h>
#include <algorithm>
@@ -27,7 +26,7 @@
#include <base/files/file_path.h>
#include <base/files/file_util.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <gmock/gmock-matchers.h>
#include <google/protobuf/repeated_field.h>
#include <gtest/gtest.h>
@@ -37,7 +36,6 @@
#include "update_engine/common/fake_boot_control.h"
#include "update_engine/common/fake_hardware.h"
#include "update_engine/common/fake_prefs.h"
-#include "update_engine/common/hardware_interface.h"
#include "update_engine/common/mock_download_action.h"
#include "update_engine/common/mock_prefs.h"
#include "update_engine/common/test_utils.h"
@@ -251,14 +249,15 @@
size_t signature_size{};
ASSERT_TRUE(
PayloadSigner::GetMaximumSignatureSize(key_path, &signature_size));
- signature_size_strings.push_back(base::StringPrintf("%zu", signature_size));
+ signature_size_strings.push_back(
+ android::base::StringPrintf("%zu", signature_size));
}
string signature_size_string = base::JoinString(signature_size_strings, ":");
ScopedTempFile hash_file("hash.XXXXXX"), metadata_hash_file("hash.XXXXXX");
string delta_generator_path = GetBuildArtifactsPath("delta_generator");
ASSERT_EQ(0,
- System(base::StringPrintf(
+ System(android::base::StringPrintf(
"%s -in_file=%s -signature_size=%s -out_hash_file=%s "
"-out_metadata_hash_file=%s",
delta_generator_path.c_str(),
@@ -295,22 +294,24 @@
base::JoinString(metadata_sig_file_paths, ":");
// Add the signature to the payload.
- ASSERT_EQ(0,
- System(base::StringPrintf("%s --signature_size=%s -in_file=%s "
- "-payload_signature_file=%s "
- "-metadata_signature_file=%s "
- "-out_file=%s",
- delta_generator_path.c_str(),
- signature_size_string.c_str(),
- payload_path.c_str(),
- sig_files_string.c_str(),
- metadata_sig_files_string.c_str(),
- payload_path.c_str())));
+ ASSERT_EQ(
+ 0,
+ System(android::base::StringPrintf("%s --signature_size=%s -in_file=%s "
+ "-payload_signature_file=%s "
+ "-metadata_signature_file=%s "
+ "-out_file=%s",
+ delta_generator_path.c_str(),
+ signature_size_string.c_str(),
+ payload_path.c_str(),
+ sig_files_string.c_str(),
+ metadata_sig_files_string.c_str(),
+ payload_path.c_str())));
- int verify_result = System(base::StringPrintf("%s -in_file=%s -public_key=%s",
- delta_generator_path.c_str(),
- payload_path.c_str(),
- public_key_path.c_str()));
+ int verify_result =
+ System(android::base::StringPrintf("%s -in_file=%s -public_key=%s",
+ delta_generator_path.c_str(),
+ payload_path.c_str(),
+ public_key_path.c_str()));
if (verification_success) {
ASSERT_EQ(0, verify_result);
@@ -415,30 +416,32 @@
std::end(kRandomString));
}
ASSERT_TRUE(utils::WriteFile(
- base::StringPrintf("%s/hardtocompress", a_mnt.c_str()).c_str(),
+ android::base::StringPrintf("%s/hardtocompress", a_mnt.c_str()).c_str(),
hardtocompress.data(),
hardtocompress.size()));
brillo::Blob zeros(16 * 1024, 0);
ASSERT_EQ(static_cast<int>(zeros.size()),
- base::WriteFile(base::FilePath(base::StringPrintf(
+ base::WriteFile(base::FilePath(android::base::StringPrintf(
"%s/move-to-sparse", a_mnt.c_str())),
reinterpret_cast<const char*>(zeros.data()),
zeros.size()));
ASSERT_TRUE(WriteSparseFile(
- base::StringPrintf("%s/move-from-sparse", a_mnt.c_str()), 16 * 1024));
+ android::base::StringPrintf("%s/move-from-sparse", a_mnt.c_str()),
+ 16 * 1024));
ASSERT_TRUE(WriteByteAtOffset(
- base::StringPrintf("%s/move-semi-sparse", a_mnt.c_str()), 4096));
+ android::base::StringPrintf("%s/move-semi-sparse", a_mnt.c_str()),
+ 4096));
// Write 1 MiB of 0xff to try to catch the case where writing a bsdiff
// patch fails to zero out the final block.
brillo::Blob ones(1024 * 1024, 0xff);
- ASSERT_TRUE(
- utils::WriteFile(base::StringPrintf("%s/ones", a_mnt.c_str()).c_str(),
- ones.data(),
- ones.size()));
+ ASSERT_TRUE(utils::WriteFile(
+ android::base::StringPrintf("%s/ones", a_mnt.c_str()).c_str(),
+ ones.data(),
+ ones.size()));
}
// Create a result image with image_size bytes of garbage.
@@ -505,7 +508,7 @@
std::end(kRandomString));
}
ASSERT_TRUE(utils::WriteFile(
- base::StringPrintf("%s/hardtocompress", b_mnt.c_str()).c_str(),
+ android::base::StringPrintf("%s/hardtocompress", b_mnt.c_str()).c_str(),
hardtocompress.data(),
hardtocompress.size()));
}
diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 443bef6..0149aa0 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -30,7 +30,7 @@
#include <base/files/scoped_temp_dir.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <brillo/secure_blob.h>
#include <gmock/gmock.h>
#include <google/protobuf/repeated_field.h>
diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 9c3934d..f5cab45 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -23,7 +23,7 @@
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include "update_engine/common/utils.h"
#include "update_engine/update_metadata.pb.h"
diff --git a/payload_consumer/partition_writer.cc b/payload_consumer/partition_writer.cc
index e55722c..a415100 100644
--- a/payload_consumer/partition_writer.cc
+++ b/payload_consumer/partition_writer.cc
@@ -30,7 +30,7 @@
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include "update_engine/common/error_code.h"
#include "update_engine/common/utils.h"
@@ -328,9 +328,9 @@
vector<string> source_extents;
for (const Extent& ext : operation.src_extents()) {
source_extents.push_back(
- base::StringPrintf("%" PRIu64 ":%" PRIu64,
- static_cast<uint64_t>(ext.start_block()),
- static_cast<uint64_t>(ext.num_blocks())));
+ android::base::StringPrintf("%" PRIu64 ":%" PRIu64,
+ static_cast<uint64_t>(ext.start_block()),
+ static_cast<uint64_t>(ext.num_blocks())));
}
LOG(ERROR) << "Operation source (offset:size) in blocks: "
<< base::JoinString(source_extents, ",");
diff --git a/payload_consumer/payload_metadata.cc b/payload_consumer/payload_metadata.cc
index f797723..d2e42f0 100644
--- a/payload_consumer/payload_metadata.cc
+++ b/payload_consumer/payload_metadata.cc
@@ -18,7 +18,7 @@
#include <endian.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include <brillo/data_encoding.h>
#include "update_engine/common/constants.h"
@@ -62,17 +62,17 @@
// Validate the magic string.
if (memcmp(payload, kDeltaMagic, sizeof(kDeltaMagic)) != 0) {
LOG(ERROR) << "Bad payload format -- invalid delta magic: "
- << base::StringPrintf("%02x%02x%02x%02x",
- payload[0],
- payload[1],
- payload[2],
- payload[3])
+ << android::base::StringPrintf("%02x%02x%02x%02x",
+ payload[0],
+ payload[1],
+ payload[2],
+ payload[3])
<< " Expected: "
- << base::StringPrintf("%02x%02x%02x%02x",
- kDeltaMagic[0],
- kDeltaMagic[1],
- kDeltaMagic[2],
- kDeltaMagic[3]);
+ << android::base::StringPrintf("%02x%02x%02x%02x",
+ kDeltaMagic[0],
+ kDeltaMagic[1],
+ kDeltaMagic[2],
+ kDeltaMagic[3]);
*error = ErrorCode::kDownloadInvalidMetadataMagicString;
return MetadataParseResult::kError;
}
diff --git a/payload_consumer/postinstall_runner_action_unittest.cc b/payload_consumer/postinstall_runner_action_unittest.cc
index c899599..38985dc 100644
--- a/payload_consumer/postinstall_runner_action_unittest.cc
+++ b/payload_consumer/postinstall_runner_action_unittest.cc
@@ -30,7 +30,7 @@
#include <base/message_loop/message_loop.h>
#endif // BASE_VER < 780000
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#if BASE_VER >= 780000 // CrOS
#include <base/task/single_thread_task_executor.h>
#endif // BASE_VER >= 780000
@@ -116,7 +116,7 @@
void SuspendRunningAction() {
if (!postinstall_action_ || !postinstall_action_->current_command_ ||
- test_utils::Readlink(base::StringPrintf(
+ test_utils::Readlink(android::base::StringPrintf(
"/proc/%d/fd/0", postinstall_action_->current_command_)) !=
"/dev/zero") {
// We need to wait for the postinstall command to start and flag that it
diff --git a/payload_consumer/verified_source_fd.cc b/payload_consumer/verified_source_fd.cc
index d760d1f..ad3a0ef 100644
--- a/payload_consumer/verified_source_fd.cc
+++ b/payload_consumer/verified_source_fd.cc
@@ -24,7 +24,7 @@
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
-#include <base/strings/stringprintf.h>
+#include <android-base/stringprintf.h>
#include "update_engine/common/error_code.h"
#include "update_engine/common/hash_calculator.h"