summaryrefslogtreecommitdiff
path: root/chromium/content/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/content/BUILD.gn
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/BUILD.gn')
-rw-r--r--chromium/content/BUILD.gn29
1 files changed, 23 insertions, 6 deletions
diff --git a/chromium/content/BUILD.gn b/chromium/content/BUILD.gn
index 7f246689419..2a7878c74fc 100644
--- a/chromium/content/BUILD.gn
+++ b/chromium/content/BUILD.gn
@@ -38,7 +38,7 @@ config("content_implementation") {
# when doing a component build).
content_shared_components = [
- "//content/gpu",
+ "//content/gpu:gpu_sources",
"//content/public/browser:browser_sources",
"//content/public/child:child_sources",
"//content/public/common:common_sources",
@@ -48,14 +48,13 @@ content_shared_components = [
]
if (enable_plugins) {
- content_shared_components += [ "//content/ppapi_plugin" ]
+ content_shared_components += [ "//content/ppapi_plugin:ppapi_plugin_sources" ]
}
if (is_component_build) {
shared_library("content") {
- public_deps = content_shared_components + [
- "//content/public/app:both_sources",
- ]
+ public_deps =
+ content_shared_components + [ "//content/public/app:both_sources" ]
}
} else {
group("content") {
@@ -78,6 +77,24 @@ grit("resources") {
source_set("export") {
visibility = [ "//content/*" ]
sources = [
- "content/common/content_export.h"
+ "content/common/content_export.h",
]
}
+
+# In the GYP build, this file is listed in several targets. In GN just have
+# those targets depend on this one. This can be depended on for any
+# platform for simplicity, and is a no-op on non-Windows.
+source_set("startup_helper_win") {
+ if (is_win) {
+ sources = [
+ "app/startup_helper_win.cc",
+ "public/app/startup_helper_win.h",
+ ]
+
+ deps = [
+ "//base",
+ "//base:i18n",
+ "//sandbox",
+ ]
+ }
+}