commit 2347481619f96a9263394b42697b563081f941cc
author Zachary Anderson <zra@google.com> Tue Mar 15 01:52:21 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Mar 15 01:52:21 2022 +0000
tree 26360f66e6b648721a5fb3104b0a359730a8fd7e
parent aec5b376d8ad88b13a0b757bf3fc839baddc742b

Make dart_target_arch filters for 32-bit intel consistent

dart_target_arch can be "x86", which is handled here:
https://github.com/dart-lang/sdk/blob/main/runtime/BUILD.gn#L113.
This CL also handles it in the remaining places.

This came up in https://github.com/flutter/engine/pull/30417

TEST=N/A
Change-Id: Ib6dcd0a7236938026a0cbcb3955433960b396667
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237120
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Zach Anderson <zra@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6295280..4b587be 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -60,9 +60,9 @@
     ]
   }
 
-  # We do not support AOT on ia32 and should therefore cannot provide native
+  # We do not support AOT on ia32 and should therefore not provide native
   # snapshot tooling.
-  if (dart_target_arch != "ia32") {
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
     if (dart_runtime_mode == "release") {
       deps += [ "runtime/bin:analyze_snapshot_product" ]
     } else {

runtime/bin/BUILD.gn

diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 04e73a2..7f0bd21 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -940,7 +940,7 @@
     "..:dart_maybe_product_config",
   ]
 
-  if (dart_target_arch != "ia32") {
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
     configs += [ "..:dart_precompiler_config" ]
   }
 

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 1241607..281ad47 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -753,8 +753,9 @@
   ]
 
   # We do not support AOT on ia32 and should therefore not add the
-  # dart native compilation files (since there is no AOT compiler/runtime available)
-  if (dart_target_arch != "ia32") {
+  # dart native compilation files since there is no AOT compiler/runtime
+  # available.
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
     public_deps += [ ":group_dart2native" ]
   }
 }