diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:43:55 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:43:55 +0000 |
| commit | bc63a8ecee1ab18fceb0f32304b5d3740dffe10c (patch) | |
| tree | f1fbc36bbbe5e96ba4eadfd6e37ead8840f94eb0 /content/content_unittests.isolate | |
| parent | 7bea7357129c4564382f0967ff331a2da3b21f52 (diff) | |
| download | chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.zip chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.tar.gz chromium_src-bc63a8ecee1ab18fceb0f32304b5d3740dffe10c.tar.bz2 | |
[Android] Convert more test targets to use isolate.
BUG=249870
TBR=ben@chromium.org, acolwell@chromium.org, joi@chromium.org, enne@chromium.org, mark@chromium.org, jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19040002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_unittests.isolate')
| -rw-r--r-- | content/content_unittests.isolate | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 9689f02..a3bd8e8 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -3,6 +3,25 @@ # found in the LICENSE file. { 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../third_party/hyphen/hyph_en_US.dic', + ], + 'isolate_dependency_untracked': [ + '../media/test/data/', + '../webkit/data/', + 'test/data/', + ], + }, + }], + ['OS=="android" or OS=="mac"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/content_resources.pak', + ], + }, + }], ['OS=="linux"', { 'variables': { 'command': [ @@ -11,8 +30,10 @@ '../tools/swarm_client/run_test_cases.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/libffmpegsumo.so', + ], + 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/test_data/', ], }, @@ -22,17 +43,11 @@ 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_untracked': [ - '../third_party/hyphen/hyph_en_US.dic', - '../webkit/data/', - 'test/data/', - ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/content_resources.pak', + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, @@ -48,7 +63,7 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/icudt.dll', ], |