Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index 0dd417d331974ca27937ca3dd54a7d8d9b504199..4db016083ba4cadeca306f3fc4b2842012d0ed34 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -190,7 +190,6 @@ group("both_gn_and_gyp") { |
| "//tools/gn:gn_unittests", |
| "//tools/perf/clear_system_cache", |
| "//ui/accessibility:accessibility_unittests", |
| - "//ui/app_list:app_list_unittests", |
| ] |
| } |
| @@ -268,11 +267,22 @@ group("both_gn_and_gyp") { |
| deps += [ "//ui/views:views_unittests" ] |
| } |
| + if (enable_app_list && !is_chromecast) { |
|
Devlin
2016/05/05 16:01:36
What's the link between app list and chromecast?
Dirk Pranke
2016/05/05 17:13:26
It seems unlikely to me that cast actually wants o
tapted
2016/05/06 02:36:56
Done.
|
| + deps += [ "//ui/app_list:app_list_unittests" ] |
| + } |
| + |
| + if (enable_app_list && use_aura) { |
| + deps += [ |
| + # TODO(tapted): Move this into enable_app_list when enable_app_list is not |
| + # true on Mac. |
| + "//ui/app_list/presenter:app_list_presenter_unittests", |
| + ] |
| + } |
| + |
| if (use_aura) { |
| deps += [ |
| "//ash:ash_shell_with_content", |
| "//ash:ash_unittests", |
| - "//ui/app_list/presenter:app_list_presenter_unittests", |
| "//ui/aura:aura_unittests", |
| "//ui/aura:demo", |
| "//ui/wm:wm_unittests", |
| @@ -548,7 +558,7 @@ group("both_gn_and_gyp") { |
| } |
| } |
| - if (toolkit_views) { |
| + if (toolkit_views && enable_app_list) { |
| deps += [ "//ui/app_list:app_list_demo" ] |
| } |