Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 import("//media/media_options.gni") | 8 import("//media/media_options.gni") |
| 9 | 9 |
| 10 source_set("browser") { | 10 source_set("browser") { |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 513 sources += [ | 513 sources += [ |
| 514 "media/cdm/browser_cdm_manager.cc", | 514 "media/cdm/browser_cdm_manager.cc", |
| 515 "media/cdm/browser_cdm_manager.h", | 515 "media/cdm/browser_cdm_manager.h", |
| 516 ] | 516 ] |
| 517 } | 517 } |
| 518 | 518 |
| 519 if (is_linux) { | 519 if (is_linux) { |
| 520 deps += [ "//third_party/boringssl" ] | 520 deps += [ "//third_party/boringssl" ] |
| 521 } | 521 } |
| 522 | 522 |
| 523 if (enable_mojo_media != "none") { | |
|
alokp
2016/02/02 00:40:44
I had to make this change to not link the default
xhwang
2016/02/02 00:50:12
When the target is dependent on the "applicaiton",
| |
| 524 configs += [ "//media/mojo/services:enable_mojo_media_config" ] | |
| 525 } | |
| 526 | |
| 527 if (enable_mojo_media == "browser") { | |
| 528 deps += [ "//media/mojo/services:application" ] | |
| 529 } | |
| 530 | |
| 531 if (enable_webvr) { | 523 if (enable_webvr) { |
| 532 sources += [ | 524 sources += [ |
| 533 "vr/vr_device.cc", | 525 "vr/vr_device.cc", |
| 534 "vr/vr_device.h", | 526 "vr/vr_device.h", |
| 535 "vr/vr_device_manager.cc", | 527 "vr/vr_device_manager.cc", |
| 536 "vr/vr_device_manager.h", | 528 "vr/vr_device_manager.h", |
| 537 "vr/vr_device_provider.h", | 529 "vr/vr_device_provider.h", |
| 538 ] | 530 ] |
| 539 } | 531 } |
| 540 | 532 |
| 541 if (enable_webvr && is_android) { | 533 if (enable_webvr && is_android) { |
| 542 sources += [ | 534 sources += [ |
| 543 "vr/android/cardboard/cardboard_vr_device.cc", | 535 "vr/android/cardboard/cardboard_vr_device.cc", |
| 544 "vr/android/cardboard/cardboard_vr_device.h", | 536 "vr/android/cardboard/cardboard_vr_device.h", |
| 545 "vr/android/cardboard/cardboard_vr_device_provider.cc", | 537 "vr/android/cardboard/cardboard_vr_device_provider.cc", |
| 546 "vr/android/cardboard/cardboard_vr_device_provider.h", | 538 "vr/android/cardboard/cardboard_vr_device_provider.h", |
| 547 ] | 539 ] |
| 548 } | 540 } |
| 549 } | 541 } |
| OLD | NEW |