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/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 27 matching lines...) Expand all Loading... | |
| 38 "//google_apis", | 38 "//google_apis", |
| 39 "//mojo/application/public/cpp:cpp_for_chromium", | 39 "//mojo/application/public/cpp:cpp_for_chromium", |
| 40 "//mojo/application/public/interfaces", | 40 "//mojo/application/public/interfaces", |
| 41 "//mojo/common", | 41 "//mojo/common", |
| 42 "//mojo/package_manager", | 42 "//mojo/package_manager", |
| 43 "//mojo/shell", | 43 "//mojo/shell", |
| 44 "//net", | 44 "//net", |
| 45 "//net:extras", | 45 "//net:extras", |
| 46 "//skia", | 46 "//skia", |
| 47 "//sql", | 47 "//sql", |
| 48 "//third_party/boringssl", | |
|
davidben
2015/11/04 00:17:38
Is this needed? (See net/ssl/ssl_platform_key.h co
svaldez
2015/11/04 16:55:51
Done.
| |
| 48 "//third_party/mojo/src/mojo/public/cpp/bindings", | 49 "//third_party/mojo/src/mojo/public/cpp/bindings", |
| 49 "//third_party/npapi", | 50 "//third_party/npapi", |
| 50 "//third_party/re2", | 51 "//third_party/re2", |
| 51 "//third_party/WebKit/public:blink_headers", | 52 "//third_party/WebKit/public:blink_headers", |
| 52 "//third_party/zlib", | 53 "//third_party/zlib", |
| 53 "//third_party/zlib:zip", | 54 "//third_party/zlib:zip", |
| 54 "//ui/accessibility", | 55 "//ui/accessibility", |
| 55 "//ui/accessibility:ax_gen", | 56 "//ui/accessibility:ax_gen", |
| 56 "//ui/base", | 57 "//ui/base", |
| 57 "//ui/base/ime", | 58 "//ui/base/ime", |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 | 482 |
| 482 if (enable_browser_cdms) { | 483 if (enable_browser_cdms) { |
| 483 sources += [ | 484 sources += [ |
| 484 "media/cdm/browser_cdm_manager.cc", | 485 "media/cdm/browser_cdm_manager.cc", |
| 485 "media/cdm/browser_cdm_manager.h", | 486 "media/cdm/browser_cdm_manager.h", |
| 486 "media/media_web_contents_observer.cc", | 487 "media/media_web_contents_observer.cc", |
| 487 "media/media_web_contents_observer.h", | 488 "media/media_web_contents_observer.h", |
| 488 ] | 489 ] |
| 489 } | 490 } |
| 490 | 491 |
| 491 if (is_linux) { | |
| 492 deps += [ "//third_party/boringssl" ] | |
| 493 } | |
| 494 | |
| 495 if (enable_mojo_media != "none") { | 492 if (enable_mojo_media != "none") { |
| 496 configs += [ "//media/mojo/services:enable_mojo_media_config" ] | 493 configs += [ "//media/mojo/services:enable_mojo_media_config" ] |
| 497 } | 494 } |
| 498 | 495 |
| 499 if (enable_mojo_media == "browser") { | 496 if (enable_mojo_media == "browser") { |
| 500 deps += [ "//media/mojo/services:application" ] | 497 deps += [ "//media/mojo/services:application" ] |
| 501 } | 498 } |
| 502 | 499 |
| 503 if (enable_webvr) { | 500 if (enable_webvr) { |
| 504 sources += [ | 501 sources += [ |
| 505 "vr/vr_device.cc", | 502 "vr/vr_device.cc", |
| 506 "vr/vr_device.h", | 503 "vr/vr_device.h", |
| 507 "vr/vr_device_manager.cc", | 504 "vr/vr_device_manager.cc", |
| 508 "vr/vr_device_manager.h", | 505 "vr/vr_device_manager.h", |
| 509 "vr/vr_device_provider.h", | 506 "vr/vr_device_provider.h", |
| 510 ] | 507 ] |
| 511 } | 508 } |
| 512 | 509 |
| 513 if (enable_webvr && is_android) { | 510 if (enable_webvr && is_android) { |
| 514 sources += [ | 511 sources += [ |
| 515 "vr/android/cardboard/cardboard_vr_device.cc", | 512 "vr/android/cardboard/cardboard_vr_device.cc", |
| 516 "vr/android/cardboard/cardboard_vr_device.h", | 513 "vr/android/cardboard/cardboard_vr_device.h", |
| 517 "vr/android/cardboard/cardboard_vr_device_provider.cc", | 514 "vr/android/cardboard/cardboard_vr_device_provider.cc", |
| 518 "vr/android/cardboard/cardboard_vr_device_provider.h", | 515 "vr/android/cardboard/cardboard_vr_device_provider.h", |
| 519 ] | 516 ] |
| 520 } | 517 } |
| 521 } | 518 } |
| OLD | NEW |