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));
});
}