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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 533743004: Fix Chrome linker errors in GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | chrome/browser/extensions/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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
9 import("//tools/grit/grit_rule.gni") 9 import("//tools/grit/grit_rule.gni")
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 "//components/invalidation", 61 "//components/invalidation",
62 "//components/metrics:net", 62 "//components/metrics:net",
63 "//components/metrics/proto:proto", 63 "//components/metrics/proto:proto",
64 "//components/navigation_metrics", 64 "//components/navigation_metrics",
65 "//components/network_time", 65 "//components/network_time",
66 "//components/omaha_query_params", 66 "//components/omaha_query_params",
67 "//components/omnibox", 67 "//components/omnibox",
68 "//components/os_crypt", 68 "//components/os_crypt",
69 "//components/password_manager/core/browser", 69 "//components/password_manager/core/browser",
70 "//components/password_manager/core/common", 70 "//components/password_manager/core/common",
71 "//components/pdf/browser",
71 "//components/policy:policy_component", 72 "//components/policy:policy_component",
72 "//components/precache/core", 73 "//components/precache/core",
73 "//components/query_parser", 74 "//components/query_parser",
74 "//components/rappor", 75 "//components/rappor",
75 "//components/renderer_context_menu", 76 "//components/renderer_context_menu",
76 "//components/search", 77 "//components/search",
77 "//components/search_engines", 78 "//components/search_engines",
78 "//components/search_provider_logos", 79 "//components/search_provider_logos",
79 "//components/signin/core/browser", 80 "//components/signin/core/browser",
80 "//components/startup_metric_utils", 81 "//components/startup_metric_utils",
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 # '<(grit_out_dir)/grit/component_extension_resources_map.cc', 129 # '<(grit_out_dir)/grit/component_extension_resources_map.cc',
129 # '<(grit_out_dir)/grit/theme_resources_map.cc', 130 # '<(grit_out_dir)/grit/theme_resources_map.cc',
130 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 131 # '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
131 # 132 #
132 # # This file is generated by 133 # # This file is generated by
133 # # chrome/browser/metrics/variations/generate_resources_map.py 134 # # chrome/browser/metrics/variations/generate_resources_map.py
134 # '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/gener ated_resources_map.cc', 135 # '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/gener ated_resources_map.cc',
135 136
136 defines = nacl_defines 137 defines = nacl_defines
137 138
138 # TODO(GYP) remove this when the real webrtc target is used below.
139 configs += [ "//content:webrtc_stub_config" ]
140
141 deps += [ 139 deps += [
142 "//apps", 140 "//apps",
143 "//cc", 141 "//cc",
144 "//chrome/browser/devtools", 142 "//chrome/browser/devtools",
145 "//chrome/browser/performance_monitor", 143 "//chrome/browser/performance_monitor",
146 "//chrome/common/extensions/api", 144 "//chrome/common/extensions/api",
147 "//chrome/common/extensions/api:api_registration", 145 "//chrome/common/extensions/api:api_registration",
148 "//chrome/installer/util", 146 "//chrome/installer/util",
149 "//components/autofill/content/browser", 147 "//components/autofill/content/browser",
150 "//components/dom_distiller/content", 148 "//components/dom_distiller/content",
151 "//components/keyed_service/content", 149 "//components/keyed_service/content",
152 "//components/navigation_interception", 150 "//components/navigation_interception",
153 "//components/password_manager/content/browser", 151 "//components/password_manager/content/browser",
154 "//components/precache/content", 152 "//components/precache/content",
155 "//components/sessions", 153 "//components/sessions",
156 "//components/storage_monitor", 154 "//components/storage_monitor",
157 "//components/translate/content/browser", 155 "//components/translate/content/browser",
158 "//components/url_matcher", 156 "//components/url_matcher",
159 "//components/visitedlink/browser", 157 "//components/visitedlink/browser",
160 "//components/visitedlink/common", 158 "//components/visitedlink/common",
161 "//components/web_modal", 159 "//components/web_modal",
162 "//content/app/resources", 160 "//content/app/resources",
163 "//media", 161 "//media",
164 "//media/cast:net", 162 "//media/cast:net",
165 "//mojo/environment:chromium", 163 "//mojo/environment:chromium",
166 "//mojo/public/cpp/bindings", 164 "//mojo/public/cpp/bindings",
167 "//mojo/public/js/bindings", 165 "//mojo/public/js/bindings",
168 "//mojo/system", 166 "//mojo/system",
167 "//net:extras",
169 "//net:net_with_v8", 168 "//net:net_with_v8",
170 "//third_party/WebKit/public:resources", 169 "//third_party/WebKit/public:resources",
171 "//third_party/expat", 170 "//third_party/expat",
172 "//third_party/leveldatabase", 171 "//third_party/leveldatabase",
173 "//third_party/libaddressinput", 172 "//third_party/libaddressinput",
174 "//third_party/libyuv", 173 "//third_party/libyuv",
175 "//third_party/npapi", 174 "//third_party/npapi",
176 "//third_party/re2", 175 "//third_party/re2",
177 "//third_party/smhasher:cityhash", 176 "//third_party/smhasher:cityhash",
177 "//third_party/webrtc/modules/desktop_capture",
178 "//ui/gl", 178 "//ui/gl",
179 "//ui/surface", 179 "//ui/surface",
180 "//ui/web_dialogs", 180 "//ui/web_dialogs",
181 "//v8", 181 "//v8",
182 "//webkit/browser:storage", 182 "//webkit/browser:storage",
183 "//webkit/common", 183 "//webkit/common",
184 "//webkit/common:storage_common", 184 "//webkit/common:storage_common",
185 ## TODO(tonyg): Remove this dependency (crbug.com/280157). 185 ## TODO(tonyg): Remove this dependency (crbug.com/280157).
186 #"../testing/perf/perf_test.gyp:*", TODO(GYP) 186 #"../testing/perf/perf_test.gyp:*", TODO(GYP)
187 # Note: for this one also remove the webrtc_stub_config
188 #"../third_party/webrtc/modules/modules.gyp:desktop_capture", TODO(GYP)
189 ] 187 ]
190 } else { # iOS 188 } else { # iOS
191 sources += rebase_path(gypi_values.chrome_browser_ios_sources, 189 sources += rebase_path(gypi_values.chrome_browser_ios_sources,
192 ".", "//chrome") 190 ".", "//chrome")
193 deps += [ 191 deps += [
194 "//net", 192 "//net",
195 ] 193 ]
196 libs += [ 194 libs += [
197 "CoreTelephony.framework", 195 "CoreTelephony.framework",
198 "CoreText.framework", 196 "CoreText.framework",
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 # TODO(GYP) write internal action 662 # TODO(GYP) write internal action
665 if (false) { #if (is_chrome_branded) { 663 if (false) { #if (is_chrome_branded) {
666 action("chrome_internal_resources_gen") { 664 action("chrome_internal_resources_gen") {
667 # TODO(GYP) 665 # TODO(GYP)
668 } 666 }
669 } else { 667 } else {
670 group("chrome_internal_resources_gen") { 668 group("chrome_internal_resources_gen") {
671 # Empty placeholder. 669 # Empty placeholder.
672 } 670 }
673 } 671 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698