diff options
| author | gunsch <gunsch@chromium.org> | 2015-07-14 22:20:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 05:21:41 +0000 |
| commit | 2b0e12f7ea49ea1665bf663d0a86ca92c25d4d26 (patch) | |
| tree | 49893df9b13d00410c88340069610c1119685251 /chromecast | |
| parent | d94a2214777c98910f946b6a15258618215545f4 (diff) | |
| download | chromium_src-2b0e12f7ea49ea1665bf663d0a86ca92c25d4d26.zip chromium_src-2b0e12f7ea49ea1665bf663d0a86ca92c25d4d26.tar.gz chromium_src-2b0e12f7ea49ea1665bf663d0a86ca92c25d4d26.tar.bz2 | |
Chromecast: adjust test generator GYP rules for ATV.
"cast_android_tests_internal" is currently a dep of the test generator target,
which results in the build/test scripts trying to run it as an actual test
target.
R=halliwell@chromium.org,lcwu@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/1239743002
Cr-Commit-Position: refs/heads/master@{#338820}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/chromecast_tests.gypi | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi index bc7b839..ef25cf1 100644 --- a/chromecast/chromecast_tests.gypi +++ b/chromecast/chromecast_tests.gypi @@ -215,6 +215,18 @@ { 'target_name': 'cast_android_tests', 'type': 'none', + 'dependencies': ['cast_android_tests_generator'], + 'conditions': [ + ['chromecast_branding=="Chrome"', { + 'dependencies': [ + 'internal/chromecast_internal.gyp:cast_android_tests_internal', + ], + }], + ], + }, # end of target 'cast_android_tests', + { + 'target_name': 'cast_android_tests_generator', + 'type': 'none', 'variables': { 'filters': [ # The following tests all crash on fugu. @@ -240,14 +252,7 @@ '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', ], 'includes': ['build/tests/test_list.gypi'], - 'conditions': [ - ['chromecast_branding=="Chrome"', { - 'dependencies': [ - 'internal/chromecast_internal.gyp:cast_android_tests_internal', - ], - }], - ], - }, + }, # end of target 'cast_android_tests_generator' { 'target_name': 'cast_android_test_lists', 'type': 'none', |