Buildroot side of change to narrow Windows Android arm hack

flutter · Nov 1, 2022 · f33db0f · f33db0f
1 parent ad96f00
commit f33db0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
@@ -531,7 +531,11 @@ if (custom_toolchain != "") {
   } else if (host_os == "mac") {
     host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
   } else if (host_os == "win") {
-    host_toolchain = "//build/toolchain/win:$current_cpu"
+    if (is_clang) {
+      host_toolchain = "//build/toolchain/win:clang_$host_cpu"
+    } else {
+      host_toolchain = "//build/toolchain/win:$host_cpu"
+    }
   } else {
     assert(false, "Unknown host for android cross compile")
   }

diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
@@ -61,7 +61,7 @@ if (current_toolchain == default_toolchain) {
                 "copy_dlls",
                 rebase_path(root_build_dir),
                 configuration,
-                target_cpu,
+                current_cpu,
               ])
 }
 
@@ -284,6 +284,13 @@ if (target_cpu == "x64") {
   }
 }
 
+if (target_cpu == "arm") {
+  # When the target cpu is "arm", we use the 32-bit intel toolchain "x86".
+  win_toolchains("x86") {
+    toolchain_arch = "x86"
+  }
+}
+
 if (target_cpu == "arm64") {
   win_toolchains("arm64") {
     toolchain_arch = "arm64"