diff --git a/minidump/minidump_system_info_writer.cc b/minidump/minidump_system_info_writer.cc
index 9c665f4f..4a22b436 100644
--- a/minidump/minidump_system_info_writer.cc
+++ b/minidump/minidump_system_info_writer.cc
@@ -123,6 +123,12 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
     case kCPUArchitectureX86_64:
       cpu_architecture = kMinidumpCPUArchitectureAMD64;
       break;
+    case kCPUArchitectureARM:
+      cpu_architecture = kMinidumpCPUArchitectureARM;
+      break;
+    case kCPUArchitectureARM64:
+      cpu_architecture = kMinidumpCPUArchitectureARM64;
+      break;
     default:
       NOTREACHED();
       cpu_architecture = kMinidumpCPUArchitectureUnknown;
@@ -160,6 +166,12 @@ void MinidumpSystemInfoWriter::InitializeFromSnapshot(
     case SystemSnapshot::kOperatingSystemWindows:
       operating_system = kMinidumpOSWin32NT;
       break;
+    case SystemSnapshot::kOperatingSystemLinux:
+      operating_system = kMinidumpOSLinux;
+      break;
+    case SystemSnapshot::kOperatingSystemAndroid:
+      operating_system = kMinidumpOSAndroid;
+      break;
     default:
       NOTREACHED();
       operating_system = kMinidumpOSUnknown;