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

Unified Diff: chrome/chrome_exe.gypi

Issue 6968007: NaCl: Conditionalise copying of IRT library based on "disable_nacl" flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move to end of block Created 9 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 3089092898f837bbe702e90c18acd270d65eca67..5c3c1cb5d1253e2edc455fdee81a68f7c5800e84 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -148,15 +148,6 @@
'chrome_exe_target': 1,
'use_system_xdg_utils%': 0,
},
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- '../native_client/irt_binaries/nacl_irt_x86_32.nexe',
- '../native_client/irt_binaries/nacl_irt_x86_64.nexe',
- ],
- },
- ],
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'actions': [
@@ -472,6 +463,17 @@
},
},
}],
+ ['disable_nacl!=1', {
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'files': [
+ '../native_client/irt_binaries/nacl_irt_x86_32.nexe',
+ '../native_client/irt_binaries/nacl_irt_x86_64.nexe',
+ ],
+ },
+ ],
+ }],
],
},
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698