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

Unified Diff: content/test/BUILD.gn

Issue 954873002: Fix content_browsertests on Linux GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « components/pdf/renderer/BUILD.gn ('k') | ppapi/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index ef135d35b1da0d39e4f497c6f4a753604746742c..9c4c8050cf9620159cdfdd96d6c97013d031d646 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -311,6 +311,8 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
"//ui/snapshot",
]
+ data_deps = []
+
if (!is_chromeos) {
sources -=
[ "../browser/web_contents/touch_editable_impl_aura_browsertest.cc" ]
@@ -391,6 +393,10 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
[ "../browser/compositor/image_transport_factory_browsertest.cc" ]
}
+ if (use_aura && !is_win) {
+ sources -= [ "../browser/plugin_browsertest.cc" ]
+ }
+
if (!is_android && !is_ios && !is_linux) {
# Npapi test plugin doesn't build on Android or iOS.
#data_deps += [ 'copy_npapi_test_plugin' ] TODO(GYP)
@@ -409,7 +415,7 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) {
content_tests_gypi_values.content_browsertests_plugins_sources,
".",
"//content")
- #deps += [ "//ppapi:ppapi_tests" ] # TODO(GYP)
+ data_deps += [ "//ppapi:ppapi_tests" ]
}
if (enable_web_speech) {
« no previous file with comments | « components/pdf/renderer/BUILD.gn ('k') | ppapi/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698