mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Prepare for building with enable_app_list=0 on Desktop 

Created by flipping enable_app_list to '0' everywhere except ChromeOS,
ensuring it passes CQ, then flipping it back.

Mostly just splitting app_list source files out to their own gyp
variables.

This will allow us to test new code needed for previously supported
platforms. The code will be required as soon as enable_app_list is
flipped to 0. E.g. calls to --show-app-list will just show chrome://apps
instead.

Builds upon initial work in https://codereview.chromium.org/1747773002/

BUG=600915
COLLABORATOR=wierichs@google.com

Review-Url: https://codereview.chromium.org/1861233003
Cr-Original-Commit-Position: refs/heads/master@{#393474}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d13e0cdf6fc5fddb580968adb2a5b9c5379a4404
This commit is contained in:
tapted 2016-05-13 01:26:56 -07:00 коммит произвёл Commit bot
Родитель b9f715e76c
Коммит 311ac5380e
4 изменённых файлов: 37 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
all.gyp
Просмотреть файл

@ -383,7 +383,6 @@
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
'../ui/app_list/app_list.gyp:app_list_unittests',
],
'conditions': [
# remoting_host_installation uses lots of non-trivial GYP that tend
@ -443,7 +442,6 @@
}],
['OS=="mac"', {
'dependencies': [
'../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/message_center/message_center.gyp:*',
],
}],
@ -462,11 +460,19 @@
'../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',
],
@ -1121,7 +1127,6 @@
'../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests',
'../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests',
'../ui/accessibility/accessibility.gyp:accessibility_unittests',
'../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/aura/aura.gyp:aura_unittests',
'../ui/compositor/compositor.gyp:compositor_unittests',
'../ui/display/display.gyp:display_unittests',
@ -1232,7 +1237,6 @@
'../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',
@ -1269,6 +1273,11 @@
'../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',

2
common.gypi
Просмотреть файл

@ -259,7 +259,7 @@
}],
# Enable App Launcher everywhere but mobile.
['OS!="ios" and OS!="android"', {
['OS!="ios" and OS!="android" and chromecast==0', {
'enable_app_list%': 1,
}, {
'enable_app_list%': 0,

2
config/features.gni
Просмотреть файл

@ -57,7 +57,7 @@ declare_args() {
enable_plugin_installation = is_win || is_mac
enable_app_list = !is_ios && !is_android
enable_app_list = !is_ios && !is_android && !is_chromecast
enable_supervised_users = !is_ios

24
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',
],