| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index 7520aab40dad9886955216a29abd4d1e7e96f351..0d7e4deda2b03ade034c94d40b9f50feb63ab9c1 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -243,6 +243,7 @@
|
| ['use_aura==1', {
|
| 'dependencies': [
|
| '../ash/ash.gyp:*',
|
| + '../ui/app_list/app_list.gyp:*',
|
| '../ui/aura/aura.gyp:*',
|
| '../ui/aura_extra/aura_extra.gyp:*',
|
| ],
|
| @@ -257,11 +258,6 @@
|
| '../third_party/boringssl/boringssl_tests.gyp:*',
|
| ],
|
| }],
|
| - ['enable_app_list==1', {
|
| - 'dependencies': [
|
| - '../ui/app_list/app_list.gyp:*',
|
| - ],
|
| - }],
|
| ['OS!="android" and OS!="ios"', {
|
| 'dependencies': [
|
| '../google_apis/gcm/gcm.gyp:*',
|
| @@ -460,19 +456,11 @@
|
| '../printing/printing.gyp:printing_unittests',
|
| ],
|
| }],
|
| - ['enable_app_list==1', {
|
| - 'dependencies': [
|
| - '../ui/app_list/app_list.gyp:app_list_unittests',
|
| - ],
|
| - }],
|
| - ['enable_app_list==1 and use_aura==1', {
|
| - 'dependencies': [
|
| - '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests',
|
| - ],
|
| - }],
|
| ['use_aura==1', {
|
| 'dependencies': [
|
| '../ash/ash.gyp:ash_unittests',
|
| + '../ui/app_list/app_list.gyp:app_list_unittests',
|
| + '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter_unittests',
|
| '../ui/aura/aura.gyp:aura_unittests',
|
| '../ui/compositor/compositor.gyp:compositor_unittests',
|
| ],
|
| @@ -1237,6 +1225,7 @@
|
| '../ppapi/ppapi_internal.gyp:ppapi_unittests',
|
| '../remoting/remoting.gyp:remoting_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| + '../ui/app_list/app_list.gyp:*',
|
| '../ui/aura/aura.gyp:*',
|
| '../ui/aura_extra/aura_extra.gyp:*',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| @@ -1273,11 +1262,6 @@
|
| '../ui/ozone/demo/ozone_demos.gyp:*',
|
| ],
|
| }],
|
| - ['enable_app_list==1', {
|
| - 'dependencies': [
|
| - '../ui/app_list/app_list.gyp:*',
|
| - ],
|
| - }],
|
| ['chromecast==0', {
|
| 'dependencies': [
|
| '../chrome/chrome.gyp:browser_tests',
|
|
|