diff options
| author | slan <slan@chromium.org> | 2015-10-26 15:13:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-26 22:14:37 +0000 |
| commit | 8a428438d64b9d2893c17cb817a8639511c88f3a (patch) | |
| tree | 3984157796ffd87e2534c9359aaa04c4ef70367c | |
| parent | 9a3b7200c73d21a161d714d1216dc9708b344b54 (diff) | |
| download | chromium_src-8a428438d64b9d2893c17cb817a8639511c88f3a.zip chromium_src-8a428438d64b9d2893c17cb817a8639511c88f3a.tar.gz chromium_src-8a428438d64b9d2893c17cb817a8639511c88f3a.tar.bz2 | |
Update GN/GYP files to more accurately exclude ash browsertests.
chrome_browser_tests_ash_sources is included when use_ash is true. It
should be excluded on this condition as well. Fixing this repairs
Chromecast builds (where use_aura=true and use_ash=false).
BUG=
Review URL: https://codereview.chromium.org/1415253007
Cr-Commit-Position: refs/heads/master@{#356145}
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
| -rw-r--r-- | chrome/test/BUILD.gn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ddda523..1613b1e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2416,7 +2416,7 @@ 'app/chrome_version.rc.version', ], }], - ['chromeos==0 and use_aura==1', { + ['chromeos==0 and use_ash==1', { 'sources!': [ # On Windows and Linux, we currently don't support enough of the # ash environment to run these unit tests. diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 815f2b6..c3f1782 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1104,7 +1104,7 @@ if (!is_android) { "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc", ] } - if (!is_chromeos && use_aura) { + if (!is_chromeos && use_ash) { sources -= [ # On Windows and Linux, we currently don't support enough of the # ash environment to run these unit tests. |