diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/media/mojo/BUILD.gn | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/media/mojo/BUILD.gn')
| -rw-r--r-- | chromium/media/mojo/BUILD.gn | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/chromium/media/mojo/BUILD.gn b/chromium/media/mojo/BUILD.gn index d2a7e20d0f8..6cac5954c31 100644 --- a/chromium/media/mojo/BUILD.gn +++ b/chromium/media/mojo/BUILD.gn @@ -46,11 +46,16 @@ buildflag_header("features") { enable_mojo_media_in_gpu_process = true } else if (mojo_media_host == "utility") { enable_mojo_media_in_utility_process = true - } else { + } else if (!enable_standalone_cdm_service) { assert(false, "Invalid mojo media host: $mojo_media_host") } } + if (enable_standalone_cdm_service) { + assert(enable_mojo_cdm, + "Mojo CDM must be enabled to run in standalone CDM service.") + } + flags = [ "ENABLE_MOJO_MEDIA=$enable_mojo_media", "ENABLE_TEST_MOJO_MEDIA_CLIENT=$enable_test_mojo_media_client", @@ -61,6 +66,7 @@ buildflag_header("features") { "ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS=$enable_mojo_media_in_browser_process", "ENABLE_MOJO_MEDIA_IN_GPU_PROCESS=$enable_mojo_media_in_gpu_process", "ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS=$enable_mojo_media_in_utility_process", + "ENABLE_STANDALONE_CDM_SERVICE=$enable_standalone_cdm_service", ] } @@ -71,11 +77,17 @@ source_set("unit_tests") { "clients/mojo_cdm_unittest.cc", "clients/mojo_decryptor_unittest.cc", "clients/mojo_renderer_unittest.cc", + "clients/mojo_video_encode_accelerator_unittest.cc", "common/media_type_converters_unittest.cc", "common/mojo_decoder_buffer_converter_unittest.cc", "common/mojo_shared_buffer_video_frame_unittest.cc", + "interfaces/audio_decoder_config_struct_traits_unittest.cc", + "interfaces/encryption_scheme_struct_traits_unittest.cc", + "interfaces/video_decoder_config_struct_traits_unittest.cc", + "interfaces/video_frame_struct_traits_unittest.cc", "services/mojo_audio_output_stream_unittest.cc", "services/mojo_cdm_allocator_unittest.cc", + "services/mojo_video_encode_accelerator_service_unittest.cc", ] if (is_android) { @@ -86,12 +98,14 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//media", - "//media:cdm_api", "//media/base:test_support", + "//media/cdm:cdm_api", "//media/mojo/clients", "//media/mojo/common", + "//media/mojo/common:mojo_shared_buffer_video_frame", "//media/mojo/interfaces", - "//media/mojo/services:lib", + "//media/mojo/interfaces:test_interfaces", + "//media/mojo/services", "//services/service_manager/tests:interfaces", "//testing/gmock", "//testing/gtest", @@ -107,14 +121,6 @@ source_set("unit_tests") { } test("media_mojo_unittests") { - # crbug.com/676418: Suppress symbol import warnings. - if (is_win && is_component_build) { - ldflags = [ - "/ignore:4217", - "/ignore:4049", - ] - } - deps = [ ":unit_tests", "//mojo/edk/test:run_all_unittests", |