Remove is_nacl in //build, //build_overrides

Bug: 40511454
Change-Id: I77ee822574e22c3cbfad0dddd68a3d95013f4dc2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6686066
Reviewed-by: Hans Wennborg <[email protected]>
Auto-Submit: Nico Weber <[email protected]>
Commit-Queue: Hans Wennborg <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1480288}
NOKEYCHECK=True
GitOrigin-RevId: 82a27169148052767b00c89f2839b35c9913b389

Author: nico

config/BUILD.gn

@@ -113,10 +113,6 @@ config("debug") {
     "DYNAMIC_ANNOTATIONS_ENABLED=1",
   ]
 
-  if (is_nacl) {
-    defines += [ "DYNAMIC_ANNOTATIONS_PREFIX=NACL_" ]
-  }
-
   if (is_win) {
     if (!enable_iterator_debugging && !use_custom_libcxx) {
       # Iterator debugging is enabled by default by the compiler on debug
@@ -139,12 +135,10 @@ config("release") {
   if (is_tsan) {
     defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=1" ]
   } else {
-    defines += [ "NVALGRIND" ]
-    if (!is_nacl) {
-      # NaCl always enables dynamic annotations. Currently this value is set to
-      # 1 for all .nexes.
-      defines += [ "DYNAMIC_ANNOTATIONS_ENABLED=0" ]
-    }
+    defines += [
+      "NVALGRIND",
+      "DYNAMIC_ANNOTATIONS_ENABLED=0",
+    ]
   }
 
   if (is_ios) {

config/BUILDCONFIG.gn

@@ -28,7 +28,7 @@
 # represents the computer doing the compile and never changes. The "target"
 # represents the main thing we're trying to build. The "current" represents
 # which configuration is currently being defined, which can be either the
-# host, the target, or something completely different (like nacl). GN will
+# host, the target, or something completely different. GN will
 # run the same build file multiple times for the different required
 # configuration in the same build.
 #
@@ -327,7 +327,12 @@ is_fuchsia = current_os == "fuchsia"
 is_ios = current_os == "ios"
 is_linux = current_os == "linux"
 is_mac = current_os == "mac"
-is_nacl = current_os == "nacl"
+
+# TODO(crbug.com/40511454): Remove is_nacl from all build files, then
+#                           remove the is_nacl variable.
+assert(current_os != "nacl")
+is_nacl = false
+
 is_wasm = current_os == "emscripten"
 is_watchos = current_os == "watchos"
 is_win = current_os == "win" || current_os == "winuwp"

config/clang/clang.gni

@@ -14,7 +14,7 @@ declare_args() {
   # coding guidelines, etc. Only used when compiling with Chrome's Clang, not
   # Chrome OS's.
   clang_use_chrome_plugins =
-      is_clang && !is_nacl && current_os != "zos" &&
+      is_clang && current_os != "zos" &&
       default_toolchain != "//build/toolchain/cros:target" &&
       # TODO(https://crbug.com/351909443): Remove this after fixing performance
       # of Clang modules build.

config/rust.gni

@@ -64,10 +64,6 @@ declare_args() {
   # not break incremental builds.
   rustc_version = ""
 
-  # If you're using a Rust toolchain as specified by rust_sysroot_absolute,
-  # you can specify whether it supports nacl here.
-  rust_toolchain_supports_nacl = false
-
   # Whether artifacts produced by the Rust compiler can participate in ThinLTO.
   #
   # One important consideration is whether the linker uses the same LLVM
@@ -112,8 +108,8 @@ declare_args() {
 use_chromium_rust_toolchain = rust_sysroot_absolute == ""
 
 # Platform support for the Rust toolchain.
-chromium_toolchain_supports_platform = !is_nacl && !is_wasm
-custom_toolchain_supports_platform = !is_nacl || rust_toolchain_supports_nacl
+chromium_toolchain_supports_platform = !is_wasm
+custom_toolchain_supports_platform = true
 
 # Not all target triples (GN toolchains) are supported by the Rust compiler.
 # Define if we support the current GN toolchain.

nocompile.gni

@@ -55,7 +55,7 @@ if (is_win) {
 }
 
 declare_args() {
-  enable_nocompile_tests = is_clang && !is_nacl
+  enable_nocompile_tests = is_clang
 }
 
 if (enable_nocompile_tests) {