Move "enable_nacl" out of //build/config/features.gni.

Ideally //build/config/features.gni would be empty (or, at least, would only reference features defined inside of //build). This CL moves the `enable_nacl` flag out of that file, and into its own dedicated file, so that it has a much smaller scope and we can help ensure that it is not referenced or needed by other projects that are using //build but aren't building Chromium. This work will be useful as part of the work we're doing to make NaCl something that can be disabled directly in DEPS (without needing to depend on GYP_DEFINES to do so). TBR=bradnelson@chromium.org R: brettw@chromium.org, bradleynelson@chromium.org, dschuff@chromium.org, phajdan.jr@chromium.org Bug: 756688 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I3af65646803912db67d421d35b4dfe9c2e0b703e Reviewed-on: https://chromium-review.googlesource.com/688314 Commit-Queue: Dirk Pranke <dpranke@chromium.org> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> Reviewed-by: Brett Wilson <brettw@chromium.org> Cr-Commit-Position: refs/heads/master@{#505188}
Denger-Network · Sep 28, 2017 · ccc0c36 · ccc0c36
1 parent 6edcc5f
commit ccc0c36
Show file tree

Hide file tree

Showing 41 changed files with 242 additions and 206 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
+import("//components/nacl/features.gni")
 import("//device/vr/features/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")

diff --git a/build/config/features.gni b/build/config/features.gni
@@ -21,16 +21,6 @@ if (is_android) {
 }
 
 declare_args() {
-  # Enables Native Client support.
-  # Temporarily disable nacl on arm64 linux to get rid of compilation errors.
-  # TODO(mcgrathr): When mipsel-nacl-clang is available, drop the exclusion.
-  enable_nacl = !is_ios && !is_android && !is_fuchsia && !is_chromecast &&
-                current_cpu != "mipsel" && current_cpu != "mips64el" &&
-                !(is_linux && target_cpu == "arm64")
-
-  # Non-SFI is not yet supported on mipsel
-  enable_nacl_nonsfi = current_cpu != "mipsel" && current_cpu != "mips64el"
-
   # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
   # We always build Google Chrome and Chromecast with proprietary codecs.
   #

diff --git a/build/config/nacl/config.gni b/build/config/nacl/config.gni
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
-
 declare_args() {
   # Native Client supports both Newlib and Glibc C libraries where Newlib
   # is assumed to be the default one; use this to determine whether Glibc
@@ -14,39 +12,44 @@ declare_args() {
 is_nacl_irt = false
 is_nacl_nonsfi = false
 
-if (enable_nacl) {
-  nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
-
-  if (is_nacl_glibc) {
-    if (current_cpu == "x86" || current_cpu == "x64") {
-      nacl_toolchain_package = "nacl_x86_glibc"
-    } else if (current_cpu == "arm") {
-      nacl_toolchain_package = "nacl_arm_glibc"
-    }
-  } else {
-    nacl_toolchain_package = "pnacl_newlib"
-  }
+nacl_toolchain_dir = "//native_client/toolchain/${host_os}_x86"
 
-  if (current_cpu == "pnacl") {
-    _nacl_tuple = "pnacl"
-  } else if (current_cpu == "x86" || current_cpu == "x64") {
-    _nacl_tuple = "x86_64-nacl"
+if (is_nacl_glibc) {
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    nacl_toolchain_package = "nacl_x86_glibc"
   } else if (current_cpu == "arm") {
-    _nacl_tuple = "arm-nacl"
-  } else if (current_cpu == "mipsel") {
-    _nacl_tuple = "mipsel-nacl"
+    nacl_toolchain_package = "nacl_arm_glibc"
   }
+} else {
+  nacl_toolchain_package = "pnacl_newlib"
+}
 
-  nacl_toolchain_bindir = "${nacl_toolchain_dir}/${nacl_toolchain_package}/bin"
-  nacl_toolchain_tooldir =
-      "${nacl_toolchain_dir}/${nacl_toolchain_package}/${_nacl_tuple}"
-  nacl_toolprefix = "${nacl_toolchain_bindir}/${_nacl_tuple}-"
+if (current_cpu == "pnacl") {
+  _nacl_tuple = "pnacl"
+} else if (current_cpu == "x86" || current_cpu == "x64") {
+  _nacl_tuple = "x86_64-nacl"
+} else if (current_cpu == "arm") {
+  _nacl_tuple = "arm-nacl"
+} else if (current_cpu == "mipsel") {
+  _nacl_tuple = "mipsel-nacl"
+} else {
+  # In order to allow this file to be included unconditionally
+  # from build files that can't depend on //components/nacl/features.gni
+  # we provide a dummy value that should be harmless if nacl isn't needed.
+  # If nacl *is* needed this will result in a real error, indicating that
+  # people need to set the toolchain path correctly.
+  _nacl_tuple = "unknown"
+}
 
-  nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
-  is_nacl_irt = current_toolchain == nacl_irt_toolchain
+nacl_toolchain_bindir = "${nacl_toolchain_dir}/${nacl_toolchain_package}/bin"
+nacl_toolchain_tooldir =
+    "${nacl_toolchain_dir}/${nacl_toolchain_package}/${_nacl_tuple}"
+nacl_toolprefix = "${nacl_toolchain_bindir}/${_nacl_tuple}-"
 
-  # Non-SFI mode is a lightweight sandbox used by Chrome OS for running ARC
-  # applications.
-  nacl_nonsfi_toolchain = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
-  is_nacl_nonsfi = current_toolchain == nacl_nonsfi_toolchain
-}
+nacl_irt_toolchain = "//build/toolchain/nacl:irt_" + target_cpu
+is_nacl_irt = current_toolchain == nacl_irt_toolchain
+
+# Non-SFI mode is a lightweight sandbox used by Chrome OS for running ARC
+# applications.
+nacl_nonsfi_toolchain = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
+is_nacl_nonsfi = current_toolchain == nacl_nonsfi_toolchain
diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 
 # Generate a nmf file

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -15,6 +15,7 @@ import("//build/toolchain/toolchain.gni")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//ppapi/features/features.gni")

diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//ppapi/features/features.gni")
 import("//printing/features/features.gni")
 import("//services/catalog/public/tools/catalog.gni")

diff --git a/chrome/app/mash/BUILD.gn b/chrome/app/mash/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/nacl/config.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
 import("//components/feature_engagement/features.gni")
+import("//components/nacl/features.gni")
 import("//components/offline_pages/features/features.gni")
 import("//components/os_crypt/features.gni")
 import("//components/signin/features.gni")

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")

diff --git a/chrome/browser/nacl_host/test/BUILD.gn b/chrome/browser/nacl_host/test/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 
 if (enable_nacl && (is_linux || is_win)) {
   executable("mock_nacl_gdb") {

diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/features.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//testing/test.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("run_jsbundler.gni")

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//components/signin/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")

diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/buildflag_header.gni")
 import("//build/util/process_version.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//mojo/public/tools/bindings/mojom.gni")

diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/sysroot.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//components/nacl/features.gni")
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   import("//media/cdm/ppapi/cdm_paths.gni")

diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/process_version_rc_template.gni")
 import("//chrome/test/mini_installer/mini_installer_test.gni")
+import("//components/nacl/features.gni")
 import("//third_party/icu/config.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")

diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/features.gni")
 import("//chrome/common/features.gni")
+import("//components/nacl/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//components/feature_engagement/features.gni")
+import("//components/nacl/features.gni")
 import("//components/offline_pages/features/features.gni")
 import("//components/os_crypt/features.gni")
 import("//components/signin/features.gni")

diff --git a/chrome/test/data/nacl/BUILD.gn b/chrome/test/data/nacl/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
+import("//components/nacl/features.gni")
 import("//ppapi/native_client/nacl_test_data.gni")
 
 group("nacl") {

diff --git a/components/BUILD.gn b/components/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//components/nacl/features.gni")
 import("//printing/features/features.gni")
 import("//rlz/features/features.gni")
 import("//testing/test.gni")

diff --git a/components/nacl/broker/BUILD.gn b/components/nacl/broker/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//build/config/compiler/compiler.gni")
+import("//components/nacl/features.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 # This file builds nacl64.exe, which is a 64-bit x86 Windows executable

diff --git a/components/nacl/browser/BUILD.gn b/components/nacl/browser/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 
 assert(enable_nacl)
 

diff --git a/components/nacl/common/BUILD.gn b/components/nacl/common/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
-import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 if (enable_nacl) {

diff --git a/components/nacl/features.gni b/components/nacl/features.gni
@@ -0,0 +1,17 @@
+# Copyright 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromecast_build.gni")
+
+declare_args() {
+  # Enables Native Client support.
+  # Temporarily disable nacl on arm64 linux to get rid of compilation errors.
+  # TODO: When mipsel-nacl-clang is available, drop the exclusion.
+  enable_nacl = !is_ios && !is_android && !is_fuchsia && !is_chromecast &&
+                current_cpu != "mipsel" && current_cpu != "mips64el" &&
+                !(is_linux && target_cpu == "arm64")
+
+  # Non-SFI is not yet supported on mipsel
+  enable_nacl_nonsfi = current_cpu != "mipsel" && current_cpu != "mips64el"
+}
diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
+import("//components/nacl/features.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 

diff --git a/components/nacl/loader/sandbox_linux/BUILD.gn b/components/nacl/loader/sandbox_linux/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//build/config/ui.gni")
+import("//components/nacl/features.gni")
 
 assert(is_linux)
 assert(enable_nacl)

diff --git a/components/nacl/renderer/BUILD.gn b/components/nacl/renderer/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 
 assert(enable_nacl)
 

diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 

diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/util/process_version.gni")
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")

diff --git a/extensions/shell/installer/linux/BUILD.gn b/extensions/shell/installer/linux/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/sysroot.gni")
 import("//build/util/version.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//components/nacl/features.gni")
 import("//extensions/features/features.gni")
 
 assert(is_desktop_linux)

diff --git a/mash/BUILD.gn b/mash/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/nacl/config.gni")
+import("//components/nacl/features.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")

diff --git a/native_client_sdk/src/BUILD.gn b/native_client_sdk/src/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
+import("//components/nacl/features.gni")
 
 declare_args() {
   # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)

diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
@@ -5,6 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 import("//build/config/nacl/rules.gni")
+import("//components/nacl/features.gni")
 import("//ppapi/features/features.gni")
 import("//testing/test.gni")
 if (is_mac) {

diff --git a/ppapi/native_client/nacl_test_data.gni b/ppapi/native_client/nacl_test_data.gni
@@ -2,7 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/nacl/config.gni")
 import("//build/config/nacl/rules.gni")
+import("//components/nacl/features.gni")
 
 assert(enable_nacl)