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

Unified Diff: chrome/test/BUILD.gn

Issue 2053083002: Build fixes for linux desktop CrOS builders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « ash/BUILD.gn ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3a5fe6e255561a774347284c50b6c0baae31b11a..6bd0b25434cb8554b30b5383aa374108ee85cac7 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -359,6 +359,7 @@ if (!is_android) {
if (is_linux) {
data += [ "$root_out_dir/libppapi_tests.so" ]
}
+
if (!is_mac) {
data_deps += [ "//chrome:packed_extra_resources" ]
}
@@ -476,10 +477,19 @@ if (!is_android) {
"//chromeos",
]
+ data += [
+ "//chrome/browser/chromeos/login/test/https_forwarder.py",
+ "//google_apis/test/",
+ "$root_out_dir/resources/chromeos/",
+ ]
+
+ data_deps += [ "//ui/keyboard:resources" ]
+
if (enable_nacl) {
data_deps += [
"//components/nacl/loader:nacl_helper",
"//components/nacl/loader:helper_nonsfi",
+ "//ppapi/native_client:irt",
]
}
@@ -886,6 +896,35 @@ if (!is_android) {
"$root_out_dir/chrome_material_200_percent.pak",
]
}
+ if (is_chromeos) {
+ data += [
+ # TODO(GYP): figure out which of these things are
+ # actually needed and also which should be pulled in via
+ # data or data_deps and through which dependencies.
+ "//chrome/browser/chromeos/login/test/https_forwarder.py",
+ "//chrome/browser/resources/chromeos/wallpaper_manager/",
+ "//chromeos/test/data/",
+ "//components/chrome_apps/webstore_widget/cws_widget/",
+ "//ui/file_manager/file_manager/",
+ "//ui/file_manager/gallery/",
+ "//ui/file_manager/image_loader/",
+ "//ui/file_manager/integration_tests/",
+ "//third_party/analytics/",
+ "//third_party/polymer/v1_0/components-chromium/polymer/",
+ "$root_out_dir/chromevox_test_data/",
+ "$root_out_dir/content_shell.pak",
+ "$root_out_dir/locales/",
+ "$root_out_dir/resources/chromeos/",
+ ]
+
+ data_deps = [
+ "//ui/keyboard:resources",
+ "//components/nacl/loader:nacl_helper",
+ "//ppapi/native_client:irt",
+ ]
+ } else {
+ data_deps = []
+ }
deps = [
":browser_tests_js_webui",
@@ -957,7 +996,7 @@ if (!is_android) {
deps += [ "//extensions:chrome_extensions_browsertests" ]
# Runtime dependencies
- data_deps = [
+ data_deps += [
"//chrome",
"//ppapi:ppapi_tests",
"//ppapi:power_saver_test_plugin",
« no previous file with comments | « ash/BUILD.gn ('k') | chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698