summaryrefslogtreecommitdiff
path: root/chromium/media/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-20 15:06:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-22 11:48:58 +0000
commitdaa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch)
tree96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/media/BUILD.gn
parentbe59a35641616a4cf23c4a13fa0632624b021c1b (diff)
downloadqtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/media/BUILD.gn')
-rw-r--r--chromium/media/BUILD.gn64
1 files changed, 7 insertions, 57 deletions
diff --git a/chromium/media/BUILD.gn b/chromium/media/BUILD.gn
index db7efe95bdf..7558e08e9e6 100644
--- a/chromium/media/BUILD.gn
+++ b/chromium/media/BUILD.gn
@@ -129,62 +129,6 @@ component("media") {
}
}
-# TODO(xhwang): Move these into source_sets in respective subfolders.
-source_set("unit_tests") {
- testonly = true
- sources = [
- "muxers/webm_muxer_unittest.cc",
- ]
-
- data = [
- "test/data/",
- ]
-
- configs += [
- ":media_config",
-
- # TODO(crbug.com/167187): Fix size_t to int truncations.
- "//build/config/compiler:no_size_t_to_int_warning",
- ]
-
- deps = [
- ":test_support",
- "//base/test:test_support",
- "//crypto",
- "//gpu:test_support",
- "//gpu/command_buffer/common",
- "//media/cdm:cdm_paths",
- "//skia", # Direct dependency required to inherit config.
- "//testing/gmock",
- "//testing/gtest",
- "//third_party/libwebm",
- "//third_party/libyuv",
- "//third_party/widevine/cdm:headers",
- "//ui/gfx:test_support",
- "//url",
- ]
-
- data_deps = []
-
- if (proprietary_codecs) {
- if (enable_hls_sample_aes) {
- deps += [ "//third_party/boringssl" ]
- }
- }
-
- if (is_mac || is_ios) {
- libs = [
- "AppKit.framework",
- "Foundation.framework",
- ]
- }
-
- if (media_use_ffmpeg) {
- # Direct dependency required to inherit config.
- deps += [ "//third_party/ffmpeg" ]
- }
-}
-
# Note: This can't be a static_library since it does not have any sources.
source_set("test_support") {
testonly = true
@@ -202,7 +146,6 @@ source_set("test_support") {
# TODO(xhwang): Move mojo/capture/remoting tests here where applicable.
test("media_unittests") {
deps = [
- ":unit_tests",
"//media/audio:unit_tests",
"//media/base:unit_tests",
"//media/cdm:unit_tests",
@@ -211,12 +154,19 @@ test("media_unittests") {
"//media/formats:unit_tests",
"//media/gpu:unit_tests",
"//media/mojo:unit_tests",
+ "//media/muxers:unit_tests",
"//media/renderers:unit_tests",
"//media/test:pipeline_integration_tests",
"//media/test:run_all_unittests",
"//media/video:unit_tests",
]
+ data = [
+ "test/data/",
+ ]
+
+ data_deps = []
+
if (media_use_ffmpeg) {
deps += [ "//media/ffmpeg:unit_tests" ]
}