Delete NaCl toolchain definitions

Bug: 40511454
Change-Id: I773cba4f4959dfbe1862bea8b8d3d91347c6128a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6669399
Reviewed-by: Hans Wennborg <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1479872}
NOKEYCHECK=True
GitOrigin-RevId: 13b8bccaa1867b29b9850350db1605bdcb5723cc

Author: zetafunction

toolchain/cros/BUILD.gn

@@ -93,88 +93,6 @@ cros_toolchain("target") {
   }
 }
 
-# This is a special toolchain needed just for the nacl_bootstrap target in
-# //native_client/src/trusted/service_runtime/linux. It is identical
-# to ":target" except that it forces `use_debug_fission1 and `use_sysroot` off,
-# and allows the user to set different sets of extra flags.
-cros_toolchain("nacl_bootstrap") {
-  toolchain_args = {
-    if (target_cpu == "arm64") {
-      current_cpu = "arm"
-    } else {
-      current_cpu = target_cpu
-    }
-    current_os = "chromeos"
-    use_debug_fission = false
-    use_sysroot = false
-  }
-
-  if (!lacros_use_chromium_toolchain) {
-    ar = cros_target_ar
-    cc = cros_target_cc
-    cxx = cros_target_cxx
-    ld = cros_target_ld
-
-    if (cros_target_nm != "") {
-      nm = cros_target_nm
-    }
-    if (cros_target_readelf != "") {
-      readelf = cros_target_readelf
-    }
-    extra_cflags = cros_nacl_bootstrap_extra_cflags
-    extra_cppflags = cros_nacl_bootstrap_extra_cppflags
-    extra_cxxflags = cros_nacl_bootstrap_extra_cxxflags
-    extra_ldflags = cros_nacl_bootstrap_extra_ldflags
-
-    needs_rewrapper_path_arg = cros_needs_rewrapper_path_arg
-  }
-
-  # We build for ARM32, even when the rest of the build targets ARM64.
-  if (target_cpu == "arm64") {
-    ar = cros_nacl_helper_arm32_ar
-    cc = cros_nacl_helper_arm32_cc
-    cxx = cros_nacl_helper_arm32_cxx
-    ld = cros_nacl_helper_arm32_ld
-
-    # Avoid accidental use of Arm64 sysroot because of SYSROOT
-    # env variable set in ChromeOS builds.
-    toolchain_args.sysroot = cros_nacl_helper_arm32_sysroot
-  }
-}
-
-# This is a special toolchain needed just for the nacl_helper target for
-# building an Arm32 nacl_helper binary on Arm64 ChromeOS targets.
-cros_toolchain("nacl_helper_arm32") {
-  toolchain_args = {
-    current_cpu = "arm"
-    current_os = "chromeos"
-    use_debug_fission = false
-    sysroot = cros_nacl_helper_arm32_sysroot
-
-    # Disable some uses of libraries that this build does not require. The
-    # sysroot for this build does not provide them, and they would be pulled in
-    # by indirect dependencies of nacl_helper otherwise.
-    use_cras = false
-    use_nss_certs = false
-    use_system_libdrm = false
-    use_system_libsync = false
-  }
-  ar = cros_nacl_helper_arm32_ar
-  cc = cros_nacl_helper_arm32_cc
-  cxx = cros_nacl_helper_arm32_cxx
-  ld = cros_nacl_helper_arm32_ld
-  readelf = cros_nacl_helper_arm32_readelf
-
-  extra_cflags = ""
-  extra_cppflags = ""
-  extra_cxxflags = ""
-  extra_ldflags = ""
-
-  if (!lacros_use_chromium_toolchain) {
-    needs_rewrapper_path_arg = cros_needs_rewrapper_path_arg
-  }
-}
-
 cros_toolchain("host") {
   toolchain_args = {
     current_cpu = host_cpu

toolchain/cros_toolchain.gni

@@ -70,22 +70,10 @@ declare_args() {
   cros_v8_snapshot_extra_cxxflags = ""
   cros_v8_snapshot_extra_ldflags = ""
   cros_v8_snapshot_sysroot = ""
-
-  cros_nacl_bootstrap_extra_cflags = ""
-  cros_nacl_bootstrap_extra_cppflags = ""
-  cros_nacl_bootstrap_extra_cxxflags = ""
-  cros_nacl_bootstrap_extra_ldflags = ""
-
-  cros_nacl_helper_arm32_ar = "${clang_base_path}/bin/llvm-ar"
-  cros_nacl_helper_arm32_cc = "${clang_base_path}/bin/clang"
-  cros_nacl_helper_arm32_cxx = "${clang_base_path}/bin/clang++"
-  cros_nacl_helper_arm32_readelf = ""
-  cros_nacl_helper_arm32_sysroot = ""
 }
 
 declare_args() {
   cros_target_ld = cros_target_cxx
   cros_host_ld = cros_host_cxx
   cros_v8_snapshot_ld = cros_v8_snapshot_cxx
-  cros_nacl_helper_arm32_ld = cros_nacl_helper_arm32_cxx
 }

toolchain/gcc_toolchain.gni

@@ -13,13 +13,6 @@ import("//build/toolchain/cc_wrapper.gni")
 import("//build/toolchain/rbe.gni")
 import("//build/toolchain/toolchain.gni")
 
-if (is_nacl) {
-  # To keep NaCl variables out of builds that don't include NaCl, all
-  # variables defined in nacl/config.gni referenced here should be protected by
-  # is_nacl conditions.
-  import("//build/config/nacl/config.gni")
-}
-
 declare_args() {
   # Enables allowlist generation for IDR_ grit defines seen by the compiler.
   # Currently works only on some platforms and enabled by default for official

toolchain/nacl_toolchain.gni

@@ -48,18 +48,6 @@ if (target_cpu == "arm64") {
   }
 }
 
-# The nacl_win64 toolchain is nearly identical to the plain x64 toolchain.
-# It's used solely for building nacl64.exe (//components/nacl/broker:nacl64).
-# The only reason it's a separate toolchain is so that it can force
-# is_component_build to false in the toolchain_args() block, because
-# building nacl64.exe in component style does not work.
-win_toolchains("nacl_win64") {
-  toolchain_arch = "x64"
-  toolchain_args = {
-    is_component_build = false
-  }
-}
-
 # WinUWP toolchains. Only define these when targeting them.
 
 if (target_os == "winuwp") {