Reapply "Fail if new BOARD_BOOTCONFIG keys are found."

This reverts commit b69c667.

Author: ser-io

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

@@ -145,6 +145,7 @@ cf_cc_library(
     srcs = ["bootconfig_args.cpp"],
     hdrs = ["bootconfig_args.h"],
     deps = [
+        "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:json",
         "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:cuttlefish_config",

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

@@ -26,6 +26,7 @@
 #include "absl/log/log.h"
 #include "absl/strings/numbers.h"
 
+#include "cuttlefish/common/libs/utils/contains.h"
 #include "cuttlefish/common/libs/utils/json.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
@@ -40,6 +41,42 @@ using vm_manager::QemuManager;
 
 namespace {
 
+static constexpr std::string_view kLegacyBoardBootconfigKeysShared[] = {
+    "androidboot.hardware",
+    "androidboot.vendor.apex.com.google.emulated.camera.provider.hal",
+    "kernel.vmw_vsock_virtio_transport_common.virtio_transport_max_vsock_pkt_"
+    "buf_size",
+};
+
+static constexpr std::string_view kLegacyBoardBootconfigKeysAuto[] = {
+    "androidboot.cuttlefish_service_bluetooth_checker",
+    "androidboot.hibernation_resume_device",
+
+    // Used by `sdv_ivi_cf` targets.
+    "androidboot.sdv.rpc.interface",
+    "androidboot.sdv.telemetry.enabled",
+};
+
+static constexpr std::string_view kLegacyBoardBootconfigKeysMinidroid[] = {
+    "androidboot.adb.enabled",
+    "androidboot.init_rc",
+    "androidboot.microdroid.debuggable",
+};
+
+static constexpr std::string_view kLegacyBoardBootconfigKeysSdvCore[] = {
+    "androidboot.adb.enabled",
+    "androidboot.init_rc",
+    "androidboot.microdroid.debuggable",
+    "androidboot.sdv.health_monitor.agent_startup_timeout_sec",
+    "androidboot.sdv.max_bundles_management_threads",
+    "androidboot.sdv.oem_metadata_device",
+    "androidboot.sdv.oem_slot_a_device",
+    "androidboot.sdv.oem_slot_b_device",
+    "androidboot.sdv.rpc.interface",
+    "androidboot.sdv.telemetry.enabled",
+    "androidboot.sdv.telemetry.enabled:",
+};
+
 template <typename T>
 void AppendMapWithReplacement(T* destination, const T& source) {
   for (const auto& [k, v] : source) {
@@ -72,10 +109,47 @@ Result<std::unordered_map<std::string, std::string>> ConsoleBootconfig(
 
 }  // namespace
 
+// Bootconfing args should be added to the launcher and no longer via the build
+// system variable `BOARD_BOOTCONFIG`. Allow legacy keys for backward
+// compatibility.
+Result<void> ValidateBoardBootconfigKeys(
+    const cuttlefish::DeviceType type,
+    const std::map<std::string, std::string, std::less<void>> args) {
+  std::vector<std::string> allowed_args(
+      std::begin(kLegacyBoardBootconfigKeysShared),
+      std::end(kLegacyBoardBootconfigKeysShared));
+  if (type == cuttlefish::DeviceType::Auto) {
+    allowed_args.insert(allowed_args.end(),
+                        std::begin(kLegacyBoardBootconfigKeysAuto),
+                        std::end(kLegacyBoardBootconfigKeysAuto));
+  } else if (type == cuttlefish::DeviceType::Minidroid) {
+    allowed_args.insert(allowed_args.end(),
+                        std::begin(kLegacyBoardBootconfigKeysMinidroid),
+                        std::end(kLegacyBoardBootconfigKeysMinidroid));
+  } else if (type == cuttlefish::DeviceType::Unknown) {
+    // Sdv core targets don't define device type yet.
+    allowed_args.insert(allowed_args.end(),
+                        std::begin(kLegacyBoardBootconfigKeysSdvCore),
+                        std::end(kLegacyBoardBootconfigKeysSdvCore));
+  }
+
+  for (auto iter = args.begin(); iter != args.end(); iter++) {
+    CF_EXPECTF(Contains(allowed_args, iter->first),
+               "Error: detected new `BOARD_BOOTCONFIG` key: \"{}\" for device "
+               "type: \"{}\"!!! Please "
+               "add new bootconfig args to the `cvd` launcher.",
+               iter->first, static_cast<int>(type));
+  }
+
+  return {};
+}
+
 Result<std::unordered_map<std::string, std::string>> BootconfigArgsFromConfig(
     const CuttlefishConfig& config,
     const CuttlefishConfig::InstanceSpecific& instance,
     const std::map<std::string, std::string, std::less<void>> builtin_bootconfig_args) {
+  CF_EXPECT(ValidateBoardBootconfigKeys(instance.device_type(), builtin_bootconfig_args));
+
   std::unordered_map<std::string, std::string> bootconfig_args;
 
   AppendMapWithReplacement(&bootconfig_args,