From f38081d1ff7c0453b8a5196fc75d74ed5b5379cf Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Fri, 19 Mar 2021 12:03:48 +0000
Subject: [PATCH] [sdk] Add analysis_server.dart.snapshot to ARM SDKs.

Fixes https://github.com/dart-lang/sdk/issues/41845.

Change-Id: Ib1558472dfef0d4c815e5ba870d087fdf18f6862
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/191922
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 BUILD.gn     |  4 +---
 sdk/BUILD.gn | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

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 + [
                         [