Skip to content

Commit c1b3de7

Browse files
committed
Port: "Add radio desktop apex to legacy boot config"
Bug: b/495490297 Bug: b/505286188
1 parent 8cee074 commit c1b3de7

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

base/cvd/cuttlefish/host/commands/assemble_cvd/bootconfig_args.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ static constexpr std::string_view kLegacyBoardBootconfigKeysSdvCore[] = {
7777
"androidboot.sdv.telemetry.enabled:",
7878
};
7979

80+
static constexpr std::string_view kLegacyBoardBootconfigKeysDesktop[] = {
81+
"androidboot.vendor.apex.com.android.hardware.radio.desktop",
82+
};
83+
8084
template <typename T>
8185
void AppendMapWithReplacement(T* destination, const T& source) {
8286
for (const auto& [k, v] : source) {
@@ -127,6 +131,10 @@ Result<void> ValidateBoardBootconfigKeys(
127131
std::begin(kLegacyBoardBootconfigKeysMinidroid),
128132
std::end(kLegacyBoardBootconfigKeysMinidroid));
129133
} else if (type == cuttlefish::DeviceType::Unknown) {
134+
// Desktop targets don't define device type yet
135+
allowed_args.insert(allowed_args.end(),
136+
std::begin(kLegacyBoardBootconfigKeysDesktop),
137+
std::end(kLegacyBoardBootconfigKeysDesktop));
130138
// Sdv core targets don't define device type yet.
131139
allowed_args.insert(allowed_args.end(),
132140
std::begin(kLegacyBoardBootconfigKeysSdvCore),

0 commit comments

Comments
 (0)