diff --git a/BUILD.gn b/BUILD.gn
index 5d3846c8a68..c25c17660a1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,6 +23,7 @@ group("most") {
     testonly = true
   }
   deps = [
+    ":analysis_server",
     ":create_sdk",
     ":dart2js",
     ":dartanalyzer",
@@ -30,9 +31,6 @@ group("most") {
     ":runtime",
     ":samples",
   ]
-  if (dart_target_arch != "arm") {
-    deps += [ ":analysis_server" ]
-  }
 }
 
 group("runtime") {
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index b6091dcccd2..aad3f5adc08 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -114,6 +114,10 @@ _scripts = [ "dartdoc" ]
 
 # Snapshots that go under bin/snapshots
 _platform_sdk_snapshots = [
+  [
+    "analysis_server",
+    "../utils/analysis_server",
+  ],
   [
     "dartanalyzer",
     "../utils/dartanalyzer:generate_dartanalyzer_snapshot",
@@ -151,12 +155,6 @@ if (create_kernel_service_snapshot) {
         "../utils/kernel-service:kernel-service_snapshot",
       ] ]
 }
-if (dart_target_arch != "arm") {
-  _platform_sdk_snapshots += [ [
-        "analysis_server",
-        "../utils/analysis_server",
-      ] ]
-}
 
 _full_sdk_snapshots = _platform_sdk_snapshots + [
                         [