diff options
| author | maruel <maruel@chromium.org> | 2014-10-01 06:21:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-01 13:22:03 +0000 |
| commit | 8214754ee5771bb64dfe9605f024cfd7c241a01e (patch) | |
| tree | cc65c74d55cbed53518a533fd27a00011587c5c6 /chrome/chrome.isolate | |
| parent | ccc3e81690cd734c1ce7679cd2cf43478c1287fa (diff) | |
| download | chromium_src-8214754ee5771bb64dfe9605f024cfd7c241a01e.zip chromium_src-8214754ee5771bb64dfe9605f024cfd7c241a01e.tar.gz chromium_src-8214754ee5771bb64dfe9605f024cfd7c241a01e.tar.bz2 | |
Rename all isolate_dependency_* to files.
Merges the lists when relevant. This simplify the management significantly.
Remove the .isolate from the '*_run' target 'includes' section.
TBR=vadimsh@chromium.org
BUG=swarming:148
Review URL: https://codereview.chromium.org/614923005
Cr-Commit-Position: refs/heads/master@{#297633}
Diffstat (limited to 'chrome/chrome.isolate')
| -rw-r--r-- | chrome/chrome.isolate | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 339329e..d13da6d 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', @@ -15,7 +15,7 @@ }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/resources.pak', ], }, @@ -25,27 +25,25 @@ 'command': [ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/resources/extension/', ], }, }], ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_200_percent.pak', ], }, @@ -55,20 +53,18 @@ 'command': [ '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_name)', ], - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/exif.so', - '<(PRODUCT_DIR)/ffmpegsumo.so', - ], - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/', '<(PRODUCT_DIR)/<(mac_product_name).app/', + '<(PRODUCT_DIR)/exif.so', + '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/<(version_full).manifest', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/chrome_elf.dll', @@ -80,14 +76,14 @@ }], ['OS=="win" and target_arch=="ia32"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/nacl64.exe', ], }, }], ['OS=="win" and component=="static_library"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_child.dll', ], }, |