Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(657)

Unified Diff: build/gn_migration.gypi

Issue 1861233003: Prepare for building with enable_app_list=0 on Desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase for r392580 - app_list_shower_views_unittest deleted by that rev Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/features.gni ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index b6657865e09b51e4c6759851324e345e90586ee1..4cfb790fc54bb3147d99211c87e2d0afb0780a5f 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -156,10 +156,14 @@
}],
['toolkit_views==1', {
'dependencies': [
- '../ui/app_list/app_list.gyp:app_list_demo',
'../ui/views/views.gyp:views_unittests',
],
}],
+ ['enable_app_list==1', {
+ 'dependencies': [
+ '../ui/app_list/app_list.gyp:app_list_demo',
+ ],
+ }],
['use_ash==1', {
'dependencies': [
'../ash/ash.gyp:ash_shell_with_content',
@@ -360,10 +364,14 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/imagediff/image_diff.gyp:image_diff',
- '../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/compositor/compositor.gyp:compositor_unittests',
],
}],
+ ['enable_app_list==1', {
+ 'dependencies': [
+ '../ui/app_list/app_list.gyp:app_list_unittests',
+ ],
+ }],
['OS!="android" and chromecast==0', {
'dependencies': [
'../chrome/chrome.gyp:browser_tests',
@@ -602,7 +610,6 @@
'../tools/battor_agent/battor_agent.gyp:battor_agent_unittests_run',
'../tools/gn/gn.gyp:gn_unittests_run',
'../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
- '../ui/app_list/app_list.gyp:app_list_unittests_run',
'../ui/compositor/compositor.gyp:compositor_unittests_run',
'../ui/display/display.gyp:display_unittests_run',
'../ui/events/events_unittests.gyp:events_unittests_run',
@@ -653,9 +660,18 @@
'../ash/ash.gyp:ash_unittests_run',
],
}],
- ['use_aura==1', {
+ ['enable_app_list==1', {
+ 'dependencies': [
+ '../ui/app_list/app_list.gyp:app_list_unittests_run',
+ ],
+ }],
+ ['enable_app_list==1 and use_aura==1', {
'dependencies': [
'../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests_run',
+ ],
+ }],
+ ['use_aura==1', {
+ 'dependencies': [
'../ui/aura/aura.gyp:aura_unittests_run',
'../ui/wm/wm.gyp:wm_unittests_run',
],
« no previous file with comments | « build/config/features.gni ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698