summaryrefslogtreecommitdiffstats
path: root/content/app
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2015-04-27 17:14:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-28 00:15:03 +0000
commitd06e3fcfcc33e9e5a9f427e21a17054a981fc7b9 (patch)
treeb5eb83e6c48d1b66869d237d1da77f7e3d7486be /content/app
parent41e95b4626a4b857c884f0ccdac7e68707c3390d (diff)
downloadchromium_src-d06e3fcfcc33e9e5a9f427e21a17054a981fc7b9.zip
chromium_src-d06e3fcfcc33e9e5a9f427e21a17054a981fc7b9.tar.gz
chromium_src-d06e3fcfcc33e9e5a9f427e21a17054a981fc7b9.tar.bz2
Fix //content/test:test_support under component builds.
Previously, //content/test:test_support depended directly on *_sources targets. In component builds, this caused the browser_tests and content_browsertests binaries to include their own copies of content as well as depend on libcontent.so. This caused browser_tests and content_browsertests to crash on startup. This CL changes test_support to depend on the targets that forward to //content in component builds and introduces such targets for gpu and ppapi_plugin. The test_support changes also exposed underspecified dependencies in extensions/renderer/BUILD.gn and third_party/libjingle/BUILD.gn, and incorrect generated file dependencies in content/browser/devtools; the generated files depend on other non-generated files so have to be directly included in //content/browser. BUG=432959 Review URL: https://codereview.chromium.org/1104973002 Cr-Commit-Position: refs/heads/master@{#327188}
Diffstat (limited to 'content/app')
-rw-r--r--content/app/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 4e48811..f6c72b9 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -72,7 +72,7 @@ content_app_extra_configs = [
]
if (!is_chrome_multiple_dll) {
- content_app_deps += [ "//content/gpu" ]
+ content_app_deps += [ "//content/gpu:gpu_sources" ]
}
# This includes the app sources for both the browser and child processes.