From d3fbbf8b5a523cf6a04e5a872d550922ee2a2e64 Mon Sep 17 00:00:00 2001
From: lambdabaa <ariaye@google.com>
Date: Wed, 31 Jul 2019 12:54:52 +0000
Subject: [PATCH] Fix the dart-sdk-linux task by not building analysis server
 on 32 bit ARM architecture

Dart FFI which is now an analysis server dependency does not yet support 32 bit ARM. I also went ahead and updated dart_api_impl.h to address the TODO about removing the architectures enabled in https://github.com/dart-lang/sdk/issues/35773 from the blocklist.

Change-Id: Id2535520df1069e21eb4fa5818484ae6d92b2efd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111314
Reviewed-by: Samir Jindel <sjindel@google.com>
---
 BUILD.gn                   |  5 ++++-
 runtime/vm/dart_api_impl.h |  7 -------
 sdk/BUILD.gn               | 24 ++++++++++++++++--------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 59c831e29fd..5a647fd7ae9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -24,12 +24,12 @@ group("default") {
 }
 
 group("most") {
+  import("runtime/runtime_args.gni")
   if (targetting_fuchsia) {
     # Fuchsia has run_vm_tests marked testonly.
     testonly = true
   }
   deps = [
-    ":analysis_server",
     ":create_sdk",
     ":dart2js",
     ":dartanalyzer",
@@ -37,6 +37,9 @@ group("most") {
     ":runtime",
     ":samples",
   ]
+  if (dart_target_arch != "arm") {
+    deps += [ ":analysis_server" ]
+  }
 }
 
 group("runtime") {
diff --git a/runtime/vm/dart_api_impl.h b/runtime/vm/dart_api_impl.h
index 341503551b3..c175efb5963 100644
--- a/runtime/vm/dart_api_impl.h
+++ b/runtime/vm/dart_api_impl.h
@@ -302,13 +302,6 @@ class Api : AllStatic {
 #if defined(TARGET_ARCH_DBC) && !defined(ARCH_IS_64_BIT)
     // TODO(36809): Support SimDBC32.
     return false;
-#elif defined(TARGET_ARCH_DBC) && !defined(HOST_ARCH_X64)
-    // TODO(35773): Support ia32, arm64, and arm.
-    return false;
-#elif defined(TARGET_ARCH_DBC) && defined(HOST_ARCH_X64) &&                    \
-    defined(HOST_OS_WINDOWS)
-    // TODO(35773): Support x64 Windows.
-    return false;
 #elif defined(TARGET_ARCH_ARM) &&                                              \
     !(defined(TARGET_OS_ANDROID) || defined(TARGET_OS_MACOS_IOS))
     // TODO(36309): Support hardfp calling convention.
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 11489e66cff..28ad137aed9 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -106,10 +106,6 @@ _scripts = [ "dartdoc" ]
 
 # Snapshots that go under bin/snapshots
 _platform_sdk_snapshots = [
-  [
-    "analysis_server",
-    "../utils/analysis_server",
-  ],
   [
     "dartanalyzer",
     "../utils/dartanalyzer:generate_dartanalyzer_snapshot",
@@ -135,12 +131,16 @@ if (create_kernel_service_snapshot) {
     ],
   ]
 }
+if (dart_target_arch != "arm") {
+  _platform_sdk_snapshots += [
+    [
+      "analysis_server",
+      "../utils/analysis_server",
+    ],
+  ]
+}
 
 _full_sdk_snapshots = [
-  [
-    "analysis_server",
-    "../utils/analysis_server",
-  ],
   [
     "dart2js",
     "../utils/compiler:dart2js",
@@ -178,6 +178,14 @@ if (create_kernel_service_snapshot) {
     ],
   ]
 }
+if (dart_target_arch != "arm") {
+  _full_sdk_snapshots += [
+    [
+      "analysis_server",
+      "../utils/analysis_server",
+    ],
+  ]
+}
 
 # Libraries that go under lib/
 _full_sdk_libraries = [