Skip to content

Commit

Permalink
Add opus dep to media pipeline_integration_test.
Browse files Browse the repository at this point in the history
arm devices require the OPUS_FIXED_POINT. This define got lost at some
point. Add a public_dep so the media_unittests gets the necessary
config.

BUG=672352
TEST=gn desc out/ //media:media_unittests

Review-Url: https://codereview.chromium.org/2562513003
Cr-Commit-Position: refs/heads/master@{#437628}
  • Loading branch information
mbjorge authored and Commit bot committed Dec 9, 2016
1 parent 4b72248 commit e9bc677
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 7 additions & 1 deletion media/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ source_set("unit_tests") {
}

if (media_use_ffmpeg) {
deps += [ "//media/ffmpeg:ffmpeg_unittests" ]
sources += [
"filters/audio_decoder_unittest.cc",
"filters/audio_file_reader_unittest.cc",
Expand All @@ -658,6 +657,13 @@ source_set("unit_tests") {
"filters/in_memory_url_protocol_unittest.cc",
]

deps += [
"//media/ffmpeg:ffmpeg_unittests",

# Direct dependency needed for the config
"//third_party/opus",
]

if (!is_android) {
sources += [
# FFmpeg on Android does not include video decoders.
Expand Down
3 changes: 3 additions & 0 deletions media/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ source_set("pipeline_integration_tests") {
"//media/base:test_support",
"//media/mojo/clients",
"//services/service_manager/public/cpp:service_test_support",

# Needed for the opus_config
"//third_party/opus",
"//url",

# TODO(dalecurtis): Required since the gmock header is included in the
Expand Down

0 comments on commit e9bc677

Please sign in to comment.