Replace base string utils with android::base ones
Test: th
Change-Id: I62c1dfb24ec1dae3cdc5e0a0a93ea2b48e9967e5
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(