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

Side by Side Diff: content/public/app/BUILD.gn

Issue 1117063004: Revert of Add a GN flag for the Windows multi-dll build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # App different than the regular content subcomponents (see comments in 5 # App different than the regular content subcomponents (see comments in
6 # //content/BUILD.gn) because it has to support the browser/child process split 6 # //content/BUILD.gn) because it has to support the browser/child process split
7 # (the "both" target include both browser and child process files and is used 7 # (the "both" target include both browser and child process files and is used
8 # for testing). 8 # for testing).
9 # 9 #
10 # In non-component mode, browser, child, and both all follow the same structure: 10 # In non-component mode, browser, child, and both all follow the same structure:
11 # foo -> 11 # foo ->
12 # //content/public/app:child (group) -> 12 # //content/public/app:child (group) ->
13 # //content/public/app:child_sources (source set) -> 13 # //content/public/app:child_sources (source set) ->
14 # //content/app:child (source set) 14 # //content/app:child (source set)
15 15
16 # In component mode, content is linked as one big turd so there is only one 16 # In component mode, content is linked as one big turd so there is only one
17 # app target containing sources ("both") and the other ones forward to it: 17 # app target containing sources ("both") and the other ones forward to it:
18 # foo -> 18 # foo ->
19 # //content/public/app:child (group; "browser" and "both" ones look the same) 19 # //content/public/app:child (group; "browser" and "both" ones look the same)
20 # //content (shared library) -> 20 # //content (shared library) ->
21 # //content/public/app:both_sources (source set) 21 # //content/public/app:both_sources (source set)
22 22
23 import("//build/config/chrome_build.gni")
24
25 public_app_shared_sources = [ 23 public_app_shared_sources = [
26 "content_jni_onload.h", 24 "content_jni_onload.h",
27 "content_main.h", 25 "content_main.h",
28 "content_main_delegate.cc", 26 "content_main_delegate.cc",
29 "content_main_delegate.h", 27 "content_main_delegate.h",
30 "content_main_runner.h", 28 "content_main_runner.h",
31 "startup_helper_win.h", 29 "startup_helper_win.h",
32 ] 30 ]
33 31
34 public_app_shared_deps = [ 32 public_app_shared_deps = [
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 84
87 sources = public_app_shared_sources 85 sources = public_app_shared_sources
88 configs += [ "//content:content_implementation" ] 86 configs += [ "//content:content_implementation" ]
89 deps = public_app_shared_deps + [ 87 deps = public_app_shared_deps + [
90 "//content/app:both", 88 "//content/app:both",
91 "//content/public/browser", 89 "//content/public/browser",
92 "//content/public/common", 90 "//content/public/common",
93 ] 91 ]
94 } 92 }
95 93
96 if (is_multi_dll_chrome) { 94 # TODO(GYP) enable chrome_multiple_dll support
95 is_chrome_multiple_dll = false
96
97 if (is_chrome_multiple_dll) {
97 source_set("browser") { 98 source_set("browser") {
98 check_includes = false # See comment above. 99 check_includes = false # See comment above.
99 100
100 sources = public_app_shared_sources 101 sources = public_app_shared_sources
101 102
102 defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ] 103 defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
103 configs += [ "//content:content_implementation" ] 104 configs += [ "//content:content_implementation" ]
104 105
105 deps = public_app_shared_deps + [ 106 deps = public_app_shared_deps + [
106 "//content/app:browser", 107 "//content/app:browser",
(...skipping 23 matching lines...) Expand all
130 ":both", 131 ":both",
131 ] 132 ]
132 } 133 }
133 group("child") { 134 group("child") {
134 deps = [ 135 deps = [
135 ":both", 136 ":both",
136 ] 137 ]
137 } 138 }
138 } 139 }
139 } 140 }
OLDNEW
« no previous file with comments | « content/app/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698