Replace base string utils with android::base ones
Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5
diff --git a/payload_generator/deflate_utils.cc b/payload_generator/deflate_utils.cc
index d196799..edd6fe1 100644
--- a/payload_generator/deflate_utils.cc
+++ b/payload_generator/deflate_utils.cc
@@ -22,7 +22,6 @@
#include <base/files/file_util.h>
#include <base/logging.h>
-#include <base/strings/string_util.h>
#include "update_engine/common/utils.h"
#include "update_engine/payload_generator/delta_diff_generator.h"
@@ -66,7 +65,7 @@
bool IsSquashfsImage(const string& part_path,
const FilesystemInterface::File& file) {
// Only check for files with img postfix.
- if (base::EndsWith(file.name, ".img", base::CompareCase::SENSITIVE) &&
+ if (android::base::EndsWith(file.name, ".img") &&
utils::BlocksInExtents(file.extents) >=
kMinimumSquashfsImageSize / kBlockSize) {
brillo::Blob super_block;
@@ -132,9 +131,7 @@
return any_of(extensions.begin(),
extensions.end(),
[name = ToStringPiece(name)](const auto& ext) {
- return base::EndsWith(name,
- ToStringPiece(ext),
- base::CompareCase::INSENSITIVE_ASCII);
+ return android::base::EndsWith(ToLower(name), ToLower(ext));
});
}
diff --git a/payload_generator/delta_diff_utils.cc b/payload_generator/delta_diff_utils.cc
index 549a2b7..033d879 100644
--- a/payload_generator/delta_diff_utils.cc
+++ b/payload_generator/delta_diff_utils.cc
@@ -41,7 +41,6 @@
#include <base/files/file_util.h>
#include <base/format_macros.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <base/threading/simple_thread.h>
#include <brillo/data_encoding.h>
diff --git a/payload_generator/erofs_filesystem_unittest.cc b/payload_generator/erofs_filesystem_unittest.cc
index af7ff5e..43a38ec 100644
--- a/payload_generator/erofs_filesystem_unittest.cc
+++ b/payload_generator/erofs_filesystem_unittest.cc
@@ -24,7 +24,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 <gtest/gtest.h>
diff --git a/payload_generator/ext2_filesystem_unittest.cc b/payload_generator/ext2_filesystem_unittest.cc
index 2f21718..28f14c6 100644
--- a/payload_generator/ext2_filesystem_unittest.cc
+++ b/payload_generator/ext2_filesystem_unittest.cc
@@ -26,7 +26,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 <gtest/gtest.h>
diff --git a/payload_generator/full_update_generator.cc b/payload_generator/full_update_generator.cc
index f360642..2491f76 100644
--- a/payload_generator/full_update_generator.cc
+++ b/payload_generator/full_update_generator.cc
@@ -24,7 +24,6 @@
#include <memory>
#include <base/format_macros.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <base/synchronization/lock.h>
#include <base/threading/simple_thread.h>
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 7507ff3..635d801 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -26,7 +26,6 @@
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_split.h>
-#include <base/strings/string_util.h>
#include <brillo/key_value_store.h>
#include <brillo/message_loops/base_message_loop.h>
#include <unistd.h>
@@ -280,7 +279,7 @@
for (const auto& it : map) {
result.emplace_back(it.first + ": " + it.second);
}
- return "{" + base::JoinString(result, ",") + "}";
+ return "{" + android::base::Join(result, ",") + "}";
}
bool ParsePerPartitionTimestamps(const string& partition_timestamps,
diff --git a/payload_generator/mapfile_filesystem_unittest.cc b/payload_generator/mapfile_filesystem_unittest.cc
index 567eb80..e3291aa 100644
--- a/payload_generator/mapfile_filesystem_unittest.cc
+++ b/payload_generator/mapfile_filesystem_unittest.cc
@@ -25,7 +25,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 <gtest/gtest.h>
diff --git a/payload_generator/payload_properties.cc b/payload_generator/payload_properties.cc
index d47c059..60c682a 100644
--- a/payload_generator/payload_properties.cc
+++ b/payload_generator/payload_properties.cc
@@ -22,7 +22,6 @@
#include <vector>
#include <base/json/json_writer.h>
-#include <base/strings/string_util.h>
#include <base/values.h>
#include <brillo/data_encoding.h>
@@ -118,7 +117,7 @@
base64_signatures.push_back(
brillo::data_encoding::Base64Encode(sig.data()));
}
- metadata_signatures_ = base::JoinString(base64_signatures, ":");
+ metadata_signatures_ = android::base::Join(base64_signatures, ":");
}
is_delta_ = std::any_of(manifest.partitions().begin(),
diff --git a/payload_generator/squashfs_filesystem_unittest.cc b/payload_generator/squashfs_filesystem_unittest.cc
index b16375b..87eacf2 100644
--- a/payload_generator/squashfs_filesystem_unittest.cc
+++ b/payload_generator/squashfs_filesystem_unittest.cc
@@ -27,7 +27,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 <gtest/gtest.h>