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

Side by Side Diff: chrome/browser/extensions/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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/ui/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 8
9 gypi_values = exec_script( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
11 [ rebase_path("../../chrome_browser_extensions.gypi") ], 11 [ rebase_path("../../chrome_browser_extensions.gypi") ],
12 "scope", 12 "scope",
13 [ "../../chrome_browser_extensions.gypi" ]) 13 [ "../../chrome_browser_extensions.gypi" ])
14 14
15 # GYP version: chrome/chrome_browser_extensions.gypi:browser_extensions 15 # GYP version: chrome/chrome_browser_extensions.gypi:browser_extensions
16 static_library("extensions") { 16 static_library("extensions") {
17 sources = [] 17 sources = []
18 sources += rebase_path( 18 sources += rebase_path(
19 gypi_values.chrome_browser_extensions_enabled_sources, 19 gypi_values.chrome_browser_extensions_enabled_sources,
20 ".", "//chrome") 20 ".", "//chrome")
21 21
22 defines = [] 22 defines = []
23 23
24 # TODO(GYP) remove this when webrtc is ported.
25 configs += [ "//content:webrtc_stub_config" ]
26
27 # Since browser and browser_extensions actually depend on each other, 24 # Since browser and browser_extensions actually depend on each other,
28 # we must omit the dependency from browser_extensions to browser. 25 # we must omit the dependency from browser_extensions to browser.
29 # However, this means browser_extensions and browser should more or less 26 # However, this means browser_extensions and browser should more or less
30 # have the same dependencies. Once browser_extensions is untangled from 27 # have the same dependencies. Once browser_extensions is untangled from
31 # browser, then we can clean up these dependencies. 28 # browser, then we can clean up these dependencies.
32 deps = [ 29 deps = [
33 "//chrome:extra_resources", 30 "//chrome:extra_resources",
34 "//chrome:resources", 31 "//chrome:resources",
35 "//chrome:strings", 32 "//chrome:strings",
36 "//chrome/app/resources:platform_locale_settings", 33 "//chrome/app/resources:platform_locale_settings",
(...skipping 22 matching lines...) Expand all
59 "//extensions/common/api:api_registration", 56 "//extensions/common/api:api_registration",
60 "//extensions/strings", 57 "//extensions/strings",
61 "//net", 58 "//net",
62 "//skia", 59 "//skia",
63 "//sync", 60 "//sync",
64 "//third_party/WebKit/public:resources", 61 "//third_party/WebKit/public:resources",
65 "//third_party/cacheinvalidation", 62 "//third_party/cacheinvalidation",
66 "//third_party/icu", 63 "//third_party/icu",
67 "//third_party/leveldatabase", 64 "//third_party/leveldatabase",
68 "//third_party/re2", 65 "//third_party/re2",
66 "//third_party/webrtc/modules/desktop_capture",
69 "//ui/accessibility:ax_gen", 67 "//ui/accessibility:ax_gen",
70 "//ui/base", 68 "//ui/base",
71 "//ui/gfx", 69 "//ui/gfx",
72 "//ui/gfx/geometry", 70 "//ui/gfx/geometry",
73 "//ui/resources", 71 "//ui/resources",
74 "//ui/strings", 72 "//ui/strings",
75 "//url", 73 "//url",
76 "//webkit/browser:storage", 74 "//webkit/browser:storage",
77 "//webkit/common:storage_common", 75 "//webkit/common:storage_common",
78 #"../third_party/webrtc/modules/modules.gyp:desktop_capture", TODO(GYP)
79 ] 76 ]
80 77
81 forward_dependent_configs_from = [ 78 forward_dependent_configs_from = [
82 "//chrome/common/extensions/api", 79 "//chrome/common/extensions/api",
83 "//content/public/browser", 80 "//content/public/browser",
84 ] 81 ]
85 82
83 # TODO(GYP) This config should be a direct_dependent_config of
84 # //third_party/webrtc/modules/desktop_capture so we shouldn't have to
85 # include it here. Remove this line when the direct_dependent_config is set.
86 configs += [ "//third_party/webrtc:common_inherited_config" ]
87
86 if (is_chromeos) { 88 if (is_chromeos) {
87 sources += rebase_path( 89 sources += rebase_path(
88 gypi_values.chrome_browser_extensions_chromeos_sources, 90 gypi_values.chrome_browser_extensions_chromeos_sources,
89 ".", "//chrome") 91 ".", "//chrome")
90 configs += [ "//build/config/linux:dbus" ] 92 configs += [ "//build/config/linux:dbus" ]
91 deps += [ 93 deps += [
92 "//third_party/libevent", 94 "//third_party/libevent",
93 "//third_party/protobuf:protobuf_lite", 95 "//third_party/protobuf:protobuf_lite",
94 #'../chromeos/ime/input_method.gyp:gencode', TODO(GYP) 96 #'../chromeos/ime/input_method.gyp:gencode', TODO(GYP)
95 ] 97 ]
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 gypi_values.chrome_browser_extensions_app_list_sources, 206 gypi_values.chrome_browser_extensions_app_list_sources,
205 ".", "//chrome") 207 ".", "//chrome")
206 } 208 }
207 209
208 if (!use_ozone) { 210 if (!use_ozone) {
209 sources -= [ 211 sources -= [
210 "global_shortcut_listener_ozone.cc", 212 "global_shortcut_listener_ozone.cc",
211 ] 213 ]
212 } 214 }
213 } 215 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698