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

Unified Diff: build/common_untrusted.gypi

Issue 452543002: Build only the appropriate x86 arches for nacl (chrome side). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix more Created 6 years, 3 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 | ppapi/native_client/native_client.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common_untrusted.gypi
diff --git a/build/common_untrusted.gypi b/build/common_untrusted.gypi
index 086264e032771a26e8771a17ff7487982a633b3e..bcc368646bce021fad55a20d5594cb5a993bdda2 100644
--- a/build/common_untrusted.gypi
+++ b/build/common_untrusted.gypi
@@ -10,6 +10,17 @@
],
'target_defaults': {
'conditions': [
+ # TODO(bradnelson): Drop this once the nacl side does the same.
+ ['target_arch=="x64"', {
+ 'variables': {
+ 'enable_x86_32': 0,
+ },
+ }],
+ ['target_arch=="ia32" and OS!="win"', {
+ 'variables': {
+ 'enable_x86_64': 0,
+ },
+ }],
['target_arch=="arm"', {
'variables': {
'clang': 1,
@@ -26,4 +37,4 @@
}],
],
},
-}
+}
« no previous file with comments | « no previous file | ppapi/native_client/native_client.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698