Skip to content

Commit 7aaba18

Browse files
committed
Switch from android::base::EqualsIgnoreCase to absl::EqualsIgnoreCase
Less reliance on android-base will help us migrate away from our local copy. Bug: b/460892568
1 parent 694afb0 commit 7aaba18

7 files changed

Lines changed: 26 additions & 25 deletions

File tree

base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ cf_cc_library(
376376
"//cuttlefish/host/libs/config:cuttlefish_config",
377377
"//cuttlefish/host/libs/metrics:metrics_orchestration",
378378
"//libbase",
379+
"@abseil-cpp//absl/strings",
379380
"@fmt",
380381
],
381382
)

base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <android-base/strings.h>
3737
#include <fmt/core.h>
3838
#include <fmt/format.h>
39+
#include "absl/strings/match.h"
3940

4041
#include "cuttlefish/common/libs/posix/symlink.h"
4142
#include "cuttlefish/common/libs/utils/contains.h"
@@ -356,15 +357,14 @@ static Result<void> ConsumeDaemonModeFlag(cvd_common::Args& args) {
356357
static constexpr std::string_view kValidTrueStrings[] = {"y", "yes",
357358
"true"};
358359
for (const auto& true_string : kValidTrueStrings) {
359-
if (android::base::EqualsIgnoreCase(true_string, match.value)) {
360+
if (absl::EqualsIgnoreCase(true_string, match.value)) {
360361
return {};
361362
}
362363
}
363364
for (const auto& false_string : kValidFalseStrings) {
364-
CF_EXPECTF(
365-
!android::base::EqualsIgnoreCase(false_string, match.value),
366-
"\"{}{} was given and is not supported by {}", match.key,
367-
match.value, kPossibleCmds);
365+
CF_EXPECTF(!absl::EqualsIgnoreCase(false_string, match.value),
366+
"\"{}{} was given and is not supported by {}",
367+
match.key, match.value, kPossibleCmds);
368368
}
369369
return CF_ERRF(
370370
"Invalid --daemon option: {}{}. {} supports only "

base/cvd/cuttlefish/host/libs/config/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ cf_cc_library(
177177
hdrs = ["external_network_mode.h"],
178178
deps = [
179179
"//cuttlefish/common/libs/utils:result",
180-
"//libbase",
180+
"@abseil-cpp//absl/strings",
181181
"@fmt",
182182
],
183183
)
@@ -202,7 +202,7 @@ cf_cc_library(
202202
hdrs = ["guest_hwui_renderer.h"],
203203
deps = [
204204
"//cuttlefish/common/libs/utils:result",
205-
"//libbase",
205+
"@abseil-cpp//absl/strings",
206206
],
207207
)
208208

@@ -221,7 +221,7 @@ cf_cc_library(
221221
hdrs = ["guest_renderer_preload.h"],
222222
deps = [
223223
"//cuttlefish/common/libs/utils:result",
224-
"//libbase",
224+
"@abseil-cpp//absl/strings",
225225
],
226226
)
227227

@@ -320,7 +320,7 @@ cf_cc_library(
320320
hdrs = ["vmm_mode.h"],
321321
deps = [
322322
"//cuttlefish/common/libs/utils:result",
323-
"//libbase",
323+
"@abseil-cpp//absl/strings",
324324
"@fmt",
325325
],
326326
)

base/cvd/cuttlefish/host/libs/config/external_network_mode.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <ostream>
2121
#include <string_view>
2222

23-
#include <android-base/strings.h>
23+
#include "absl/strings/match.h"
2424

2525
#include "cuttlefish/common/libs/utils/result.h"
2626

@@ -37,9 +37,9 @@ std::ostream& operator<<(std::ostream& out, ExternalNetworkMode net) {
3737
}
3838
}
3939
Result<ExternalNetworkMode> ParseExternalNetworkMode(std::string_view str) {
40-
if (android::base::EqualsIgnoreCase(str, "tap")) {
40+
if (absl::EqualsIgnoreCase(str, "tap")) {
4141
return ExternalNetworkMode::kTap;
42-
} else if (android::base::EqualsIgnoreCase(str, "slirp")) {
42+
} else if (absl::EqualsIgnoreCase(str, "slirp")) {
4343
return ExternalNetworkMode::kSlirp;
4444
} else {
4545
return CF_ERRF(

base/cvd/cuttlefish/host/libs/config/guest_hwui_renderer.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <string>
2121
#include <string_view>
2222

23-
#include <android-base/strings.h>
23+
#include "absl/strings/match.h"
2424

2525
#include "cuttlefish/common/libs/utils/result.h"
2626

@@ -42,11 +42,11 @@ std::string ToString(GuestHwuiRenderer renderer) {
4242
}
4343

4444
Result<GuestHwuiRenderer> ParseGuestHwuiRenderer(std::string_view str) {
45-
if (android::base::EqualsIgnoreCase(str, "unknown")) {
45+
if (absl::EqualsIgnoreCase(str, "unknown")) {
4646
return GuestHwuiRenderer::kUnknown;
47-
} else if (android::base::EqualsIgnoreCase(str, "skiagl")) {
47+
} else if (absl::EqualsIgnoreCase(str, "skiagl")) {
4848
return GuestHwuiRenderer::kSkiaGl;
49-
} else if (android::base::EqualsIgnoreCase(str, "skiavk")) {
49+
} else if (absl::EqualsIgnoreCase(str, "skiavk")) {
5050
return GuestHwuiRenderer::kSkiaVk;
5151
} else {
5252
return CF_ERRF("\"{}\" is not a valid HWUI renderer.", str);

base/cvd/cuttlefish/host/libs/config/guest_renderer_preload.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <string>
2121
#include <string_view>
2222

23-
#include <android-base/strings.h>
23+
#include "absl/strings/match.h"
2424

2525
#include "cuttlefish/common/libs/utils/result.h"
2626

@@ -44,13 +44,13 @@ std::string ToString(GuestRendererPreload preload) {
4444
}
4545

4646
Result<GuestRendererPreload> ParseGuestRendererPreload(std::string_view str) {
47-
if (android::base::EqualsIgnoreCase(str, "auto")) {
47+
if (absl::EqualsIgnoreCase(str, "auto")) {
4848
return GuestRendererPreload::kAuto;
49-
} else if (android::base::EqualsIgnoreCase(str, "default")) {
49+
} else if (absl::EqualsIgnoreCase(str, "default")) {
5050
return GuestRendererPreload::kGuestDefault;
51-
} else if (android::base::EqualsIgnoreCase(str, "enabled")) {
51+
} else if (absl::EqualsIgnoreCase(str, "enabled")) {
5252
return GuestRendererPreload::kEnabled;
53-
} else if (android::base::EqualsIgnoreCase(str, "disabled")) {
53+
} else if (absl::EqualsIgnoreCase(str, "disabled")) {
5454
return GuestRendererPreload::kDisabled;
5555
} else {
5656
return CF_ERRF("\"{}\" is not a valid renderer preload.", str);

base/cvd/cuttlefish/host/libs/config/vmm_mode.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <string>
2222
#include <string_view>
2323

24-
#include <android-base/strings.h>
24+
#include "absl/strings/match.h"
2525

2626
#include "cuttlefish/common/libs/utils/result.h"
2727

@@ -47,11 +47,11 @@ std::ostream& operator<<(std::ostream& out, VmmMode vmm) {
4747
}
4848

4949
Result<VmmMode> ParseVmm(std::string_view str) {
50-
if (android::base::EqualsIgnoreCase(str, "crosvm")) {
50+
if (absl::EqualsIgnoreCase(str, "crosvm")) {
5151
return VmmMode::kCrosvm;
52-
} else if (android::base::EqualsIgnoreCase(str, "gem5")) {
52+
} else if (absl::EqualsIgnoreCase(str, "gem5")) {
5353
return VmmMode::kGem5;
54-
} else if (android::base::EqualsIgnoreCase(str, "qemu_cli")) {
54+
} else if (absl::EqualsIgnoreCase(str, "qemu_cli")) {
5555
return VmmMode::kQemu;
5656
} else {
5757
return CF_ERRF("\"{}\" is not a valid Vmm.", str);

0 commit comments

Comments
 (0)