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

Unified Diff: chrome/test/BUILD.gn

Issue 1413783003: Make chrome and other targets compile on Mac GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ChromeOS fixes Created 5 years, 2 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 7f32839a328ed32c28615b888261cec14ab2a258..815f2b6d45fc9eef976ef9fb93021cf3d61f77a4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -420,10 +420,6 @@ if (!is_android) {
".",
"//chrome")
sources += [ "../browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc" ]
- sources -= [
- # Use only the _chromeos version on ChromeOS.
- "base/view_event_test_platform_part_ash.cc",
- ]
deps += [
"//ash/resources",
@@ -513,11 +509,24 @@ if (!is_android) {
"//chrome")
}
+ if (!use_aura) {
+ sources -= [
+ "base/interactive_test_utils_aura.cc",
+ "base/interactive_test_utils_aura.h",
+ ]
+ }
+
if (use_ash) {
sources += rebase_path(
chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources,
".",
"//chrome")
+ if (is_chromeos) {
+ sources -= [
+ # Use only the _chromeos version on ChromeOS.
+ "base/view_event_test_platform_part_ash.cc",
+ ]
+ }
deps += [ "//ash:interactive_ui_test_support" ]
}
@@ -983,6 +992,10 @@ if (!is_android) {
defines += [ "DEBUG_DEVTOOLS=1" ]
}
if (use_ash) {
+ sources +=
+ rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
+ ".",
+ "//chrome")
deps += [ "//ash:test_support" ]
}
if (use_aura || toolkit_views) {
@@ -1034,9 +1047,11 @@ if (!is_android) {
"../browser/extensions/api/terminal/terminal_private_apitest.cc",
"../browser/invalidation/profile_invalidation_provider_factory_browsertest.cc",
"../browser/net/nss_context_chromeos_browsertest.cc",
- "../browser/ui/ash/keyboard_controller_browsertest.cc",
"data/webui/certificate_viewer_ui_test-inl.h",
]
+ if (use_ash) {
+ sources -= [ "../browser/ui/ash/keyboard_controller_browsertest.cc" ]
+ }
if (toolkit_views) {
sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
}
« BUILD.gn ('K') | « chrome/chrome_tests.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698