Commit fa2f13f0 authored by Sergei D's avatar Sergei D Committed by Commit Bot

Build headless chrome without video support by default.

There is little point of decoding video if nobody is going to watch it.
Also helps excersize "no video" build configuration that tends to break.

Change-Id: I01bdb08b8b9822ce6eb8182bba3b8d7a94705eb3
Reviewed-on: https://chromium-review.googlesource.com/625537
Commit-Queue: Sergei Datsenko <dats@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496619}
parent 442257be
......@@ -330,7 +330,6 @@ test("media_unittests") {
"//media/audio:unit_tests",
"//media/base:unit_tests",
"//media/cdm:unit_tests",
"//media/ffmpeg:unit_tests",
"//media/gpu:unit_tests",
"//media/mojo:unit_tests",
"//media/renderers:unit_tests",
......@@ -339,6 +338,10 @@ test("media_unittests") {
"//media/video:unit_tests",
]
if (media_use_ffmpeg) {
deps += [ "//media/ffmpeg:unit_tests" ]
}
if (is_android) {
deps += [
# The test needs the java dependencies to add the java classes for their
......
......@@ -14,8 +14,8 @@
// backwards compatibility for legacy applications using the library.
#define VPX_CODEC_DISABLE_COMPAT 1
extern "C" {
#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h"
#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" // nogncheck
#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" // nogncheck
}
#endif
......
......@@ -17,7 +17,7 @@
#endif
#if !defined(MEDIA_DISABLE_FFMPEG)
#include "third_party/ffmpeg/ffmpeg_features.h"
#include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck
extern "C" {
#include <libavutil/cpu.h>
#include <libavutil/log.h>
......
......@@ -22,7 +22,6 @@ media_subcomponent_deps = [
"//media/base/android",
"//media/cdm",
"//media/device_monitors",
"//media/ffmpeg",
"//media/filters",
"//media/formats",
"//media/muxers",
......@@ -96,6 +95,10 @@ declare_args() {
# enable_hls_sample_aes can only be true if enable_mse_mpeg2ts_stream_parser is.
assert(enable_mse_mpeg2ts_stream_parser || !enable_hls_sample_aes)
if (media_use_ffmpeg) {
media_subcomponent_deps += [ "//media/ffmpeg" ]
}
# Use a second declare_args() to pick up possible overrides of |use_cras|.
declare_args() {
# Enables runtime selection of PulseAudio library.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment