Move ProtectiveMbr to mbr.[cc,h]

Bug: b/435760503

Author: Databean

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

@@ -77,6 +77,7 @@ cf_cc_library(
 
 cf_cc_library(
     name = "mbr",
+    srcs = ["mbr.cc"],
     hdrs = ["mbr.h"],
 )
 

base/cvd/cuttlefish/host/libs/image_aggregator/image_aggregator.cc

@@ -53,24 +53,6 @@ namespace {
 
 constexpr int GPT_NUM_PARTITIONS = 128;
 
-/**
- * Creates a "Protective" MBR Partition Table header. The GUID
- * Partition Table Specification recommends putting this on the first sector
- * of the disk, to protect against old disk formatting tools from misidentifying
- * the GUID Partition Table later and doing the wrong thing.
- */
-MasterBootRecord ProtectiveMbr(std::uint64_t size) {
-  MasterBootRecord mbr = {
-      .partitions = {{
-          .partition_type = 0xEE,
-          .first_lba = 1,
-          .num_sectors = (std::uint32_t)size / kSectorSize,
-      }},
-      .boot_signature = {0x55, 0xAA},
-  };
-  return mbr;
-}
-
 struct __attribute__((packed)) GptHeader {
   std::uint8_t signature[8];
   std::uint8_t revision[4];

base/cvd/cuttlefish/host/libs/image_aggregator/mbr.cc

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "cuttlefish/host/libs/image_aggregator/mbr.h"
+
+#include <stdint.h>
+
+namespace cuttlefish {
+
+MasterBootRecord ProtectiveMbr(uint64_t size) {
+  MasterBootRecord mbr = {
+      .partitions = {{
+          .partition_type = 0xEE,
+          .first_lba = 1,
+          .num_sectors = (uint32_t)size / kSectorSize,
+      }},
+      .boot_signature = {0x55, 0xAA},
+  };
+  return mbr;
+}
+
+}  // namespace cuttlefish

base/cvd/cuttlefish/host/libs/image_aggregator/mbr.h

@@ -39,4 +39,12 @@ struct __attribute__((packed)) MasterBootRecord {
 
 static_assert(sizeof(MasterBootRecord) == kSectorSize);
 
+/**
+ * Creates a "Protective" MBR Partition Table header. The GUID
+ * Partition Table Specification recommends putting this on the first sector
+ * of the disk, to protect against old disk formatting tools from misidentifying
+ * the GUID Partition Table later and doing the wrong thing.
+ */
+MasterBootRecord ProtectiveMbr(uint64_t size);
+
 }  // namespace cuttlefish