diff --git a/old-configure.in b/old-configure.in
index c3fa5846f927..6765f43acba4 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2082,7 +2082,7 @@ MOZ_ARG_DISABLE_BOOL(crashreporter,
     [MOZ_CRASHREPORTER=],
     [MOZ_CRASHREPORTER=F # Force enable breakpad])
 
-if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then
+if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin" -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
   if test "$MOZ_CRASHREPORTER" = F; then
     AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.])
   fi
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
index b1c66f9fb30b..d8ec9284cc98 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
@@ -21,21 +21,23 @@ if CONFIG['OS_TARGET'] != 'Android':
         'http_upload.cc',
     ]
 
-HostLibrary('host_breakpad_linux_common_s')
-HOST_SOURCES += [
-    'crc32.cc',
-    'dump_symbols.cc',
-    'elf_symbols_to_module.cc',
-    'elfutils.cc',
-    'file_id.cc',
-    'linux_libc_support.cc',
-    'memory_mapped_file.cc',
-]
+if CONFIG['HOST_OS_ARCH'] == 'Linux':
+    HostLibrary('host_breakpad_linux_common_s')
 
-HOST_CXXFLAGS += [
-    '-O2',
-    '-g',
-]
+    HOST_SOURCES += [
+        'crc32.cc',
+        'dump_symbols.cc',
+        'elf_symbols_to_module.cc',
+        'elfutils.cc',
+        'file_id.cc',
+        'linux_libc_support.cc',
+        'memory_mapped_file.cc',
+    ]
+
+    HOST_CXXFLAGS += [
+        '-O2',
+        '-g',
+    ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['ANDROID_NDK_MAJOR_VERSION'] = CONFIG['ANDROID_NDK_MAJOR_VERSION']
diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build
index a1825db153d6..1c8be950a6c1 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build
@@ -64,9 +64,6 @@ if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += [
         'android/breakpad_getcontext.S',
     ]
-    LOCAL_INCLUDES += [
-        '/toolkit/crashreporter/google-breakpad/src/common/android/include',
-    ]
 
 Library('breakpad_common_s')
 
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
index a56318746f0b..f30a20e04b7d 100644
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -60,9 +60,10 @@ if CONFIG['MOZ_CRASHREPORTER']:
             'google-breakpad/src/common',
             'google-breakpad/src/common/linux',
             'google-breakpad/src/processor',
-            'google-breakpad/src/tools/linux/dump_syms',
             'rust',
         ]
+        if CONFIG['HOST_OS_ARCH'] != 'Darwin':
+            DIRS += ['google-breakpad/src/tools/linux/dump_syms']
 
 
     DIRS += [