Skip to content

Port ag/37776360 : "Simplify DeviceType parsing for automotive variants" #1977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Databean merged 1 commit into from
Jan 14, 2026
+6 −2
Merged

Port ag/37776360 : "Simplify DeviceType parsing for automotive variants" #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions base/cvd/cuttlefish/common/libs/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ cf_cc_library(
name = "device_type",
srcs = ["device_type.cpp"],
hdrs = ["device_type.h"],
deps = [
"@abseil-cpp//absl/strings",
],
)

cf_cc_library(
Expand Down
5 changes: 3 additions & 2 deletions base/cvd/cuttlefish/common/libs/utils/device_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#include <string_view>

#include "absl/strings/match.h"

namespace cuttlefish {

// Parse device type from android-info.txt config field.
Expand All @@ -26,8 +28,7 @@ DeviceType ParseDeviceType(std::string_view type_name) {
return DeviceType::Phone;
} else if (type_name == "wear") {
return DeviceType::Wear;
} else if (type_name == "auto" || type_name == "auto_portrait" ||
type_name == "auto_dd" || type_name == "auto_md") {
} else if (absl::StartsWith(type_name, "auto")) {
return DeviceType::Auto;
} else if (type_name == "foldable") {
return DeviceType::Foldable;
Expand Down
Loading