From 25a0554294f7c88337067d7ce7c1edceda310289 Mon Sep 17 00:00:00 2001 From: Brett Wilson Date: Fri, 16 Dec 2016 12:15:44 -0800 Subject: [PATCH] Convert USE_PROPRIETARY_CODECS to a buildflag header. Convert the preprocessor define to a buildflag //header defined in //media. The build arg is kept in //build/config/features.gni due to a dependency on WebRTC (described in a comment). R=xhwang@chromium.org Review-Url: https://codereview.chromium.org/2572883002 . Cr-Original-Commit-Position: refs/heads/master@{#439175} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 866e43b5348172572654dde22dfcf0556fe47d26 --- config/BUILD.gn | 3 --- config/features.gni | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/BUILD.gn b/config/BUILD.gn index 80427f26a..b9eb2ef50 100644 --- a/config/BUILD.gn +++ b/config/BUILD.gn @@ -136,9 +136,6 @@ config("feature_flags") { if (enable_wayland_server) { defines += [ "ENABLE_WAYLAND_SERVER=1" ] } - if (proprietary_codecs) { - defines += [ "USE_PROPRIETARY_CODECS" ] - } if (safe_browsing_mode == 1) { defines += [ "FULL_SAFE_BROWSING" ] defines += [ "SAFE_BROWSING_CSD" ] diff --git a/config/features.gni b/config/features.gni index 53fe23fc7..564b45a8b 100644 --- a/config/features.gni +++ b/config/features.gni @@ -35,6 +35,9 @@ declare_args() { # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. # We always build Google Chrome and Chromecast with proprietary codecs. + # + # Note: this flag is used by WebRTC which is DEPSed into Chrome. Moving it + # out of //build will require using the build_overrides directory. proprietary_codecs = is_chrome_branded || is_chromecast # Variable safe_browsing is used to control the build time configuration for