Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: mojo/BUILD.gn

Issue 1443483004: Adding --no-nacl to gn disables nonsfi and sfi nacl from building. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 23682f4a9fefc8807c53d39a061ef85a0efcf632..75ddfa12a498cb5afb7a6027264b2a752ca0662d 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 @@ group("mojo") {
}
if (mojo_use_nacl) {
- 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_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",
+ ]
+ }
}
}
« no previous file with comments | « examples/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698