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

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

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | content/common/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("//content/browser/browser.gni") 8 import("//content/browser/browser.gni")
9 import("//media/media_options.gni") 9 import("//media/media_options.gni")
10 10
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 ] 355 ]
356 libs += [ "jnigraphics" ] 356 libs += [ "jnigraphics" ]
357 } 357 }
358 358
359 if (is_mac) { 359 if (is_mac) {
360 sources -= [ 360 sources -= [
361 "device_sensors/data_fetcher_shared_memory_default.cc", 361 "device_sensors/data_fetcher_shared_memory_default.cc",
362 "geolocation/empty_wifi_data_provider.cc", 362 "geolocation/empty_wifi_data_provider.cc",
363 "geolocation/empty_wifi_data_provider.h", 363 "geolocation/empty_wifi_data_provider.h",
364 ] 364 ]
365 deps += [ 365 deps += [ "//ui/accelerated_widget_mac" ]
366 "//sandbox/mac:sandbox", 366 libs += [ "bsm" ]
367 "//third_party/mozilla",
368 "//third_party/sudden_motion_sensor",
369 "//ui/accelerated_widget_mac",
370 ]
371 libs += [
372 "bsm",
373 "QTKit.framework",
374 ]
375 } 367 }
376 368
377 if (is_chromeos) { 369 if (is_chromeos) {
378 sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ] 370 sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
379 deps += [ 371 deps += [
380 "//chromeos", 372 "//chromeos",
381 "//chromeos:power_manager_proto", 373 "//chromeos:power_manager_proto",
382 ] 374 ]
383 } 375 }
384 376
385 if (use_aura) { 377 if (use_aura) {
386 deps += [ 378 deps += [
387 "//ui/aura", 379 "//ui/aura",
388 "//ui/aura_extra", 380 "//ui/aura_extra",
389 "//ui/strings", 381 "//ui/strings",
390 "//ui/wm", 382 "//ui/wm",
391 ] 383 ]
392 } else { # Not aura. 384 } else { # Not aura.
393 sources -= [ 385 sources -= [
394 "renderer_host/compositor_resize_lock_aura.cc",
395 "renderer_host/compositor_resize_lock_aura.h",
396 "renderer_host/input/synthetic_gesture_target_aura.cc", 386 "renderer_host/input/synthetic_gesture_target_aura.cc",
397 "renderer_host/input/synthetic_gesture_target_aura.h", 387 "renderer_host/input/synthetic_gesture_target_aura.h",
398 "renderer_host/native_web_keyboard_event_aura.cc", 388 "renderer_host/native_web_keyboard_event_aura.cc",
399 "renderer_host/render_widget_host_view_aura.cc", 389 "renderer_host/render_widget_host_view_aura.cc",
400 "renderer_host/render_widget_host_view_aura.h", 390 "renderer_host/render_widget_host_view_aura.h",
401 "renderer_host/ui_events_helper.cc", 391 "renderer_host/ui_events_helper.cc",
402 "renderer_host/ui_events_helper.h", 392 "renderer_host/ui_events_helper.h",
403 "renderer_host/web_input_event_aura.cc", 393 "renderer_host/web_input_event_aura.cc",
404 "renderer_host/web_input_event_aura.h", 394 "renderer_host/web_input_event_aura.h",
405 "web_contents/aura/gesture_nav_simple.cc", 395 "web_contents/aura/gesture_nav_simple.cc",
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 } 453 }
464 454
465 if (is_linux && use_openssl) { 455 if (is_linux && use_openssl) {
466 deps += [ "//third_party/boringssl" ] 456 deps += [ "//third_party/boringssl" ]
467 } 457 }
468 458
469 if (enable_media_mojo_renderer) { 459 if (enable_media_mojo_renderer) {
470 deps += [ "//media/mojo/services:renderer_service" ] 460 deps += [ "//media/mojo/services:renderer_service" ]
471 } 461 }
472 } 462 }
OLDNEW
« no previous file with comments | « no previous file | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698