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

Unified Diff: chrome/test/BUILD.gn

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: drop patchset dependency, rebase to master Created 4 years, 8 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
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 72929f866a48cab519570a3c5249a91a6c4ce667..5474be5fcef43f00a48219a58c71868297ad68f5 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -621,7 +621,6 @@ if (!is_android) {
"//sync",
"//sync:test_support_sync_fake_server",
"//sync:test_support_sync_testserver",
- "//ui/app_list:test_support",
]
if (is_mac) {
@@ -632,7 +631,9 @@ if (!is_android) {
"../browser/sync/test/integration/dictionary_load_observer.h",
]
}
- if (!enable_app_list) {
+ if (enable_app_list) {
+ deps += [ "//ui/app_list:test_support" ]
+ } else {
sources -= [
"../browser/sync/test/integration/sync_app_list_helper.cc",
"../browser/sync/test/integration/sync_app_list_helper.h",
@@ -1275,6 +1276,11 @@ if (!is_android) {
chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
".",
"//chrome")
+ if (is_mac) {
+ # This assumes the AppList is views-based.
+ sources -=
+ [ "../browser/ui/app_list/app_list_service_views_browsertest.cc" ]
+ }
}
if (enable_service_discovery) {
sources += rebase_path(
@@ -2141,6 +2147,10 @@ test("unit_tests") {
chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_sources,
".",
"//chrome")
+ if (is_mac) {
+ # This assumes the AppList is views-based.
+ sources -= [ "../browser/ui/app_list/app_list_shower_views_unittest.cc" ]
+ }
deps += [ "//ui/app_list:test_support" ]
}
if (enable_app_list && is_chromeos) {
@@ -2148,6 +2158,8 @@ test("unit_tests") {
chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources,
".",
"//chrome")
+ sources -=
+ [ "../browser/ui/views/app_list/linux/app_list_linux_unittest.cc" ]
sources += rebase_path(
chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_arc_sources,
".",

Powered by Google App Engine
This is Rietveld 408576698