diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-09-18 13:46:51 -0700 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-09-18 20:48:00 +0000 |
| commit | aeae967ce9fd0b084bf7ab55a8e40a1eaf80afd0 (patch) | |
| tree | 0a83c2f2a1ef50f00742b4cea25ab8d02ca6ab50 /chrome/chrome.isolate | |
| parent | 1fe230bebb74588fa0b2c714f9719ecfbc900b28 (diff) | |
| download | chromium_src-aeae967ce9fd0b084bf7ab55a8e40a1eaf80afd0.zip chromium_src-aeae967ce9fd0b084bf7ab55a8e40a1eaf80afd0.tar.gz chromium_src-aeae967ce9fd0b084bf7ab55a8e40a1eaf80afd0.tar.bz2 | |
Don't include nacl_irt_x86_64.nexe in isolate for 32 bit Linux builds which don't have it.
This is breaking after r295514 which enforces that every file listed in an isolate file exists.
BUG=414808
R=erg@chromium.org
Review URL: https://codereview.chromium.org/584553006
Cr-Commit-Position: refs/heads/master@{#295548}
Diffstat (limited to 'chrome/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index c59555f..fe3924f 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -30,13 +30,19 @@ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', - '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/resources/extension/', ], }, }], + ['OS=="win" or (OS=="linux" and target_arch=="x64")', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + ], + }, + }], ['OS=="mac"', { 'variables': { 'command': [ |