Replace base string utils with android::base ones
Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5
diff --git a/aosp/dynamic_partition_control_android.cc b/aosp/dynamic_partition_control_android.cc
index 822b05e..78cda20 100644
--- a/aosp/dynamic_partition_control_android.cc
+++ b/aosp/dynamic_partition_control_android.cc
@@ -31,7 +31,6 @@
#include <android-base/strings.h>
#include <base/files/file_util.h>
#include <base/logging.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <bootloader_message/bootloader_message.h>
#include <fs_mgr.h>
diff --git a/aosp/dynamic_partition_control_android_unittest.cc b/aosp/dynamic_partition_control_android_unittest.cc
index 30780f0..c93d4c3 100644
--- a/aosp/dynamic_partition_control_android_unittest.cc
+++ b/aosp/dynamic_partition_control_android_unittest.cc
@@ -21,7 +21,6 @@
#include <vector>
#include <base/logging.h>
-#include <base/strings/string_util.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <libavb/libavb.h>
diff --git a/aosp/dynamic_partition_test_utils.h b/aosp/dynamic_partition_test_utils.h
index c518382..07bb386 100644
--- a/aosp/dynamic_partition_test_utils.h
+++ b/aosp/dynamic_partition_test_utils.h
@@ -23,14 +23,13 @@
#include <map>
#include <memory>
#include <string>
-#include <vector>
-#include <base/strings/string_util.h>
#include <fs_mgr.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <liblp/builder.h>
#include <storage_literals/storage_literals.h>
+#include <android-base/strings.h>
#include "update_engine/common/boot_control_interface.h"
#include "update_engine/update_metadata.pb.h"
@@ -148,9 +147,7 @@
}
for (const auto& pair : partition_sizes) {
for (size_t suffix_idx = 0; suffix_idx < kMaxNumSlots; ++suffix_idx) {
- if (base::EndsWith(pair.first,
- kSlotSuffixes[suffix_idx],
- base::CompareCase::SENSITIVE)) {
+ if (android::base::EndsWith(pair.first, kSlotSuffixes[suffix_idx])) {
AddPartition(
&manifest,
manifest.mutable_dynamic_partition_metadata()->mutable_groups(
diff --git a/aosp/dynamic_partition_utils.cc b/aosp/dynamic_partition_utils.cc
index 6b77a45..b62b435 100644
--- a/aosp/dynamic_partition_utils.cc
+++ b/aosp/dynamic_partition_utils.cc
@@ -18,8 +18,8 @@
#include <vector>
+#include <android-base/strings.h>
#include <base/logging.h>
-#include <base/strings/string_util.h>
using android::fs_mgr::MetadataBuilder;
@@ -29,7 +29,7 @@
const std::string& suffix) {
std::vector<std::string> groups = builder->ListGroups();
for (const auto& group_name : groups) {
- if (base::EndsWith(group_name, suffix, base::CompareCase::SENSITIVE)) {
+ if (android::base::EndsWith(group_name, suffix)) {
LOG(INFO) << "Removing group " << group_name;
builder->RemoveGroupAndPartitions(group_name);
}
diff --git a/aosp/hardware_android.cc b/aosp/hardware_android.cc
index f8732ab..29d742f 100644
--- a/aosp/hardware_android.cc
+++ b/aosp/hardware_android.cc
@@ -26,7 +26,6 @@
#include <android-base/properties.h>
#include <base/files/file_util.h>
#include <base/strings/string_number_conversions.h>
-#include <base/strings/string_util.h>
#include <bootloader_message/bootloader_message.h>
#include <fstab/fstab.h>
#include <libavb/libavb.h>
@@ -108,7 +107,7 @@
const std::string encoded_digest =
base::HexEncode(vbmeta_digest, AVB_SHA256_DIGEST_SIZE);
LOG(INFO) << "vbmeta digest for target slot: " << encoded_digest;
- return base::ToLowerASCII(encoded_digest);
+ return ToLower(encoded_digest);
}
} // namespace
diff --git a/aosp/logging_android.cc b/aosp/logging_android.cc
index d1f10d6..d4e2015 100644
--- a/aosp/logging_android.cc
+++ b/aosp/logging_android.cc
@@ -32,7 +32,6 @@
#include <android-base/unique_fd.h>
#include <base/files/dir_reader_posix.h>
#include <base/logging.h>
-#include <base/strings/string_util.h>
#include <android-base/stringprintf.h>
#include <log/log.h>
diff --git a/aosp/metrics_reporter_android.cc b/aosp/metrics_reporter_android.cc
index d974616..6b83231 100644
--- a/aosp/metrics_reporter_android.cc
+++ b/aosp/metrics_reporter_android.cc
@@ -19,12 +19,11 @@
#include <stdint.h>
#include <algorithm>
-#include <any>
#include <memory>
#include <string>
#include <android-base/properties.h>
-#include <base/strings/string_util.h>
+#include <android-base/strings.h>
#include <fs_mgr.h>
#include <libdm/dm.h>
#include <liblp/builder.h>
@@ -34,12 +33,12 @@
#include "update_engine/common/constants.h"
#include "update_engine/payload_consumer/install_plan.h"
+using android::base::EndsWith;
using android::fs_mgr::GetPartitionGroupName;
using android::fs_mgr::LpMetadata;
using android::fs_mgr::MetadataBuilder;
using android::fs_mgr::ReadMetadata;
using android::fs_mgr::SlotNumberForSlotSuffix;
-using base::EndsWith;
namespace {
// A number offset adds on top of the enum value. e.g. ErrorCode::SUCCESS will
@@ -104,9 +103,7 @@
super_partition_size_bytes = GetTotalSuperPartitionSize(*metadata);
for (const auto& group : metadata->groups) {
- if (EndsWith(GetPartitionGroupName(group),
- fs_mgr_get_slot_suffix(),
- base::CompareCase::SENSITIVE)) {
+ if (EndsWith(GetPartitionGroupName(group), fs_mgr_get_slot_suffix())) {
slot_size_bytes += group.maximum_size;
}
}