Adding --no-nacl to gn disables nonsfi and sfi nacl from building.
Previously, "mojo_use_nacl" was SFI-specific. Now, it applies to both SFI and
non-SFI NaCl. Using the "--no-nacl" flag should set this variable to false,
disabling both SFI and non-SFI NaCl, as well as targets built by the PNaCl Newlib
toolchain.
This argument is NOT active by default, since we still want coverage of NaCl
within Mojo, but it should make non-NaCl Mojo compilation faster.
BUG=#483
R=phosek@chromium.org
Review URL: https://codereview.chromium.org/1443483004 .
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 23682f4..75ddfa1 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -2,17 +2,13 @@
# 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/module_args/mojo.gni")
import("//mojo/public/mojo.gni")
import("//testing/test.gni")
declare_args() {
mojo_use_go = false
-
- # TODO(ncbray): support ASAN once NaCl's GN build is unforked.
- # TODO(cstout): support fnl/musl build in nacl
- mojo_use_nacl = is_linux && !is_asan && !is_fnl
- mojo_use_nacl_nonsfi = (is_linux || is_android) && !is_asan && !is_fnl
}
group("mojo") {
@@ -44,17 +40,19 @@
}
if (mojo_use_nacl) {
- deps += [
- "//mojo/nacl/sfi:mojo_nacl",
- "//mojo/nacl/sfi:mojo_nacl_tests",
- ]
- }
+ if (mojo_use_nacl_sfi) {
+ deps += [
+ "//mojo/nacl/sfi:mojo_nacl",
+ "//mojo/nacl/sfi:mojo_nacl_tests",
+ ]
+ }
- if (mojo_use_nacl_nonsfi) {
- deps += [
- "//mojo/nacl/nonsfi:mojo_nacl_nonsfi",
- "//mojo/nacl/nonsfi:mojo_nacl_tests_nonsfi",
- ]
+ if (mojo_use_nacl_nonsfi) {
+ deps += [
+ "//mojo/nacl/nonsfi:mojo_nacl_nonsfi",
+ "//mojo/nacl/nonsfi:mojo_nacl_tests_nonsfi",
+ ]
+ }
}
}
