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

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

Issue 335973002: Minor Fixes for Windows GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « BUILD.gn ('k') | content/ppapi_plugin/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 source_set("browser") { 9 source_set("browser") {
10 # Only targets in the content tree can depend directly on this target. 10 # Only targets in the content tree can depend directly on this target.
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 } 238 }
239 } 239 }
240 240
241 if (is_linux && use_aura) { 241 if (is_linux && use_aura) {
242 configs += [ "//build/config/linux:fontconfig" ] 242 configs += [ "//build/config/linux:fontconfig" ]
243 } 243 }
244 244
245 if (use_x11) { 245 if (use_x11) {
246 configs += [ "//build/config/linux:x11" ] 246 configs += [ "//build/config/linux:x11" ]
247 } else { 247 } else {
248 sources -= [ "renderer_host/web_input_event_aurax11.cc" ] 248 sources -= [
249 "power_save_blocker_x11.cc",
250 "renderer_host/web_input_event_aurax11.cc",
251 ]
249 } 252 }
250 253
251 if (use_pango) { 254 if (use_pango) {
252 configs += [ "//build/config/linux:pangocairo" ] 255 configs += [ "//build/config/linux:pangocairo" ]
253 } 256 }
254 257
255 if (is_android) { 258 if (is_android) {
256 sources += rebase_path(content_browser_gypi_values.android_browser_sources, 259 sources += rebase_path(content_browser_gypi_values.android_browser_sources,
257 ".", "//content") 260 ".", "//content")
258 sources -= [ 261 sources -= [
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 "renderer_host/ui_events_helper.cc", 335 "renderer_host/ui_events_helper.cc",
333 "renderer_host/ui_events_helper.h", 336 "renderer_host/ui_events_helper.h",
334 "context_factory.cc", 337 "context_factory.cc",
335 ] 338 ]
336 } 339 }
337 340
338 if (use_aura || is_mac) { 341 if (use_aura || is_mac) {
339 sources += rebase_path( 342 sources += rebase_path(
340 content_browser_gypi_values.compositor_browser_sources, 343 content_browser_gypi_values.compositor_browser_sources,
341 ".", "//content") 344 ".", "//content")
345 if (!use_x11) {
346 sources -= [
347 "compositor/software_output_device_x11.cc",
348 "compositor/software_output_device_x11.h",
349 ]
350 }
342 deps += [ "//ui/compositor" ] 351 deps += [ "//ui/compositor" ]
343 } 352 }
344 353
345 if (enable_speech_input) { 354 if (enable_speech_input) {
346 deps += [ 355 deps += [
347 "//third_party/flac", 356 "//third_party/flac",
348 "//third_party/speex", 357 "//third_party/speex",
349 ] 358 ]
350 } 359 }
351 360
352 if (is_linux) { 361 if (is_linux) {
353 if (use_dbus) { 362 if (use_dbus) {
354 sources -= [ 363 sources -= [
355 "geolocation/empty_wifi_data_provider.cc", 364 "geolocation/empty_wifi_data_provider.cc",
356 ] 365 ]
357 deps += [ "//dbus" ] 366 deps += [ "//dbus" ]
358 } else { 367 } else {
359 # This will already have gotten removed for all non-Linux cases. 368 # This will already have gotten removed for all non-Linux cases.
360 sources -= [ "geolocation/wifi_data_provider_linux.cc" ] 369 sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
361 } 370 }
362 } 371 }
363 } 372 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | content/ppapi_plugin/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698