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

Unified Diff: build/config/features.gni

Issue 2001523002: GYP changes for arm64 linux build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comments related to disabling nacl and tcmalloc in GN files. Created 4 years, 6 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 | « build/config/compiler/BUILD.gn ('k') | build/config/sysroot.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index e1c8847f25bbde7175f77954ce27b9fb4f138f5d..1850e19d4e9add904cd1dd83598b4451a2c0de43 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -29,9 +29,10 @@ declare_args() {
enable_pdf = !is_android && !is_ios && !is_chromecast
# 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_chromecast && current_cpu != "mipsel"
+ enable_nacl = !is_ios && !is_android && !is_chromecast &&
+ current_cpu != "mipsel" && !(is_linux && target_cpu == "arm64")
# If debug_devtools is set to true, JavaScript files for DevTools are stored
# as is and loaded from disk. Otherwise, a concatenated file is stored in
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | build/config/sysroot.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698