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

Side by Side Diff: content/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 | « content/BUILD.gn ('k') | content/public/renderer/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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/browser/browser.gni") 7 import("//content/browser/browser.gni")
8 8
9 config("storage_config") { 9 config("storage_config") {
10 if (is_android) { 10 if (is_android) {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 "//ui/resources", 106 "//ui/resources",
107 "//ui/surface", 107 "//ui/surface",
108 "//webkit/browser:storage", 108 "//webkit/browser:storage",
109 "//webkit/common", 109 "//webkit/common",
110 "//webkit/common:storage_common", 110 "//webkit/common:storage_common",
111 ] 111 ]
112 } 112 }
113 113
114 configs += [ 114 configs += [
115 "//content:content_implementation", 115 "//content:content_implementation",
116 "//content:libjingle_stub_config", # TODO(GYP) remove when libjingle is rea dy. 116
117 "//content:webrtc_stub_config", # TODO(GYP) remove when webrtc is ready. 117 # TODO(GYP) remove this when libjingle_webrtc is working.
118 "//third_party/libjingle:jingle_direct_dependent_configs", # TODO(GYP)
118 ] 119 ]
119 120
120 if (toolkit_views) { 121 if (toolkit_views) {
121 deps += [ "//ui/events" ] 122 deps += [ "//ui/events" ]
122 } 123 }
123 124
124 if (is_win) { 125 if (is_win) {
125 sources += [ 126 sources += [
126 "power_profiler/power_data_provider_ia_win.cc", 127 "power_profiler/power_data_provider_ia_win.cc",
127 "power_profiler/power_data_provider_ia_win.h", 128 "power_profiler/power_data_provider_ia_win.h",
(...skipping 21 matching lines...) Expand all
149 if (!is_mac && !is_ios) { 150 if (!is_mac && !is_ios) {
150 deps += [ "//sandbox" ] 151 deps += [ "//sandbox" ]
151 } 152 }
152 if (!is_android && !is_ios) { 153 if (!is_android && !is_ios) {
153 deps += [ "//content/browser/tracing:resources" ] 154 deps += [ "//content/browser/tracing:resources" ]
154 } 155 }
155 156
156 if (enable_webrtc) { 157 if (enable_webrtc) {
157 sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources, 158 sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources,
158 ".", "//content") 159 ".", "//content")
159 # TODO(GYP) 160 deps += [ "//jingle:jingle_glue" ]
160 #deps += [ "//jingle:glue" ]
161 if (is_linux) { 161 if (is_linux) {
162 # TODO(GYP) 162 #deps += [ "//third_party/libjingle:libjingle_webrtc" ] TODO(GYP)
163 #deps += [ "//third_party/libjingle:libjingle_webrtc" ]
164 } 163 }
165 if (is_linux || is_mac || is_win) { 164 if (is_linux || is_mac || is_win) {
166 sources += [ 165 sources += [
167 "media/capture/desktop_capture_device.cc", 166 "media/capture/desktop_capture_device.cc",
168 "media/capture/desktop_capture_device.h", 167 "media/capture/desktop_capture_device.h",
169 "media/capture/desktop_capture_device_uma_types.cc", 168 "media/capture/desktop_capture_device_uma_types.cc",
170 "media/capture/desktop_capture_device_uma_types.h", 169 "media/capture/desktop_capture_device_uma_types.h",
171 ] 170 ]
172 if (use_aura) { 171 if (use_aura) {
173 sources += [ 172 sources += [
174 "media/capture/desktop_capture_device_aura.cc", 173 "media/capture/desktop_capture_device_aura.cc",
175 "media/capture/desktop_capture_device_aura.h", 174 "media/capture/desktop_capture_device_aura.h",
176 ] 175 ]
177 } 176 }
178 defines += [ "ENABLE_SCREEN_CAPTURE=1" ] 177 defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
179 # TODO(GYP) 178 deps += [ "//third_party/webrtc/modules/desktop_capture" ]
180 #deps += [ "//third_party/webrtc/modules:desktop_capture" ]
181 } 179 }
182 } 180 }
183 181
184 if (is_win) { 182 if (is_win) {
185 sources -= [ 183 sources -= [
186 "device_sensors/data_fetcher_shared_memory_default.cc", 184 "device_sensors/data_fetcher_shared_memory_default.cc",
187 "geolocation/empty_wifi_data_provider.cc", 185 "geolocation/empty_wifi_data_provider.cc",
188 ] 186 ]
189 defines += [ 187 defines += [
190 # This prevents the inclusion of atlhost.h which paired 188 # This prevents the inclusion of atlhost.h which paired
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 deps += [ "//dbus" ] 406 deps += [ "//dbus" ]
409 } else { 407 } else {
410 # This will already have gotten removed for all non-Linux cases. 408 # This will already have gotten removed for all non-Linux cases.
411 sources -= [ 409 sources -= [
412 "battery_status/battery_status_manager_linux.cc", 410 "battery_status/battery_status_manager_linux.cc",
413 "geolocation/wifi_data_provider_linux.cc", 411 "geolocation/wifi_data_provider_linux.cc",
414 ] 412 ]
415 } 413 }
416 } 414 }
417 } 415 }
OLDNEW
« no previous file with comments | « content/BUILD.gn ('k') | content/public/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698