Commit 8f0f2928 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Disable logging override in jumbo builds

In jumbo builds (|use_jumbo_build| is true), multiple .cc files are
combined and compiled together. If we override logging, we could end up
overriding logging in other .cc files as well. See Bug for details.

Bug: 933757
Change-Id: If6b64e7c6782691ed002fd773aae87f91aca5490
Reviewed-on: https://chromium-review.googlesource.com/c/1481576Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634291}
parent 277a15d9
......@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
import("//build/config/features.gni")
import("//build/config/jumbo.gni")
import("//media/gpu/args.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
import("//third_party/libaom/options.gni")
......@@ -78,8 +79,10 @@ declare_args() {
# Enable HLS with SAMPLE-AES decryption.
enable_hls_sample_aes = proprietary_codecs && is_chromecast
# Enable logging override, e.g. enable DVLOGs at build time.
enable_logging_override = is_chromecast
# Enable logging override, e.g. enable DVLOGs at build time. Must not be
# enabled when |use_jumbo_build| is true, in which case multiple .cc files
# are combined and we could override more logging than expected.
enable_logging_override = !use_jumbo_build && is_chromecast
# If true, use cast CMA backend instead of default chromium media pipeline.
# TODO(sanfin): Remove this flag when all builds enable CMA.
......@@ -92,6 +95,9 @@ 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)
# Logging override must not be enabled in jumbo builds.
assert(!use_jumbo_build || !enable_logging_override)
if (media_use_ffmpeg) {
media_subcomponent_deps += [ "//media/ffmpeg" ]
}
......
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