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

Unified Diff: BUILD.gn

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up for review Created 5 years, 10 months 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 | « no previous file | base/BUILD.gn » ('j') | base/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index e47ef757b7abc16dcb050d168a15e189ecd87ea3..f3e59063437905b07efd00c4c8c8b2e245c190ea 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -8,7 +8,9 @@
# you add a new build file, there must be some path of dependencies from this
# file to your new one or GN won't know about it.
+import("//build/config/features.gni")
import("//build/config/ui.gni")
+
if (is_android) {
import("//build/config/android/config.gni")
}
@@ -161,6 +163,12 @@ group("root") {
deps += [ "//ui/wm" ]
}
+ if (enable_nacl && enable_nacl_untrusted) {
+ if (is_linux && cpu_arch == "x64") {
Nick Bray (chromium) 2015/02/05 23:21:45 Are you not supporting x86 at this point? TODO?
Dirk Pranke 2015/02/05 23:52:19 Correct (only x64). I will add a TODO.
+ deps += [ "//ppapi:ppapi_cpp_lib(//native_client/build/toolchain/nacl:clang_newlib_x64)" ]
+ }
+ }
+
if (is_win) {
deps += [ "//ui/metro_viewer" ]
}
« no previous file with comments | « no previous file | base/BUILD.gn » ('j') | base/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698