diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2016-03-11 08:32:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 16:34:02 +0000 |
| commit | 43631fe1435e3c79467550b2cf797383d4cba8e6 (patch) | |
| tree | 4ff5f7aa5038cce391e760eff220f0c46554e695 /build | |
| parent | b09acb30bb05049938812b2600a57fd57f9b2fdc (diff) | |
| download | chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.zip chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.tar.gz chromium_src-43631fe1435e3c79467550b2cf797383d4cba8e6.tar.bz2 | |
Flip proprietary codecs to false for Android chromium builds.
Official builds still using branding=Chrome so they will continue
to support codecs and containers like h264, mp3, aac, and mp4.
Adds support for video/webm videos using vp8,vorbis to the webview
tests so they will continue to work w/o proprietary codecs.
We have approval to do this now. Summary will be posted to the
src= launch bug: http://crbug.com/533190#c17
This will require some changes to the build flags for the official
WebView AOSP builders, which I'll land shortly after this.
BUG=570762
TEST=webview tests pass.
Review URL: https://codereview.chromium.org/1577433004
Cr-Commit-Position: refs/heads/master@{#380649}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 | ||||
| -rw-r--r-- | build/config/features.gni | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index b1b14d1..885e325 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -833,10 +833,9 @@ 'use_browser_spellchecker%': 1, }], - # Android OS includes support for proprietary codecs regardless of - # building Chromium or Google Chrome. We also ship Google Chrome and - # Chromecast with proprietary codecs. - ['OS=="android" or branding=="Chrome" or chromecast==1', { + # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. + # We always build Google Chrome and Chromecast with proprietary codecs. + ['branding=="Chrome" or chromecast==1', { 'proprietary_codecs%': 1, }, { 'proprietary_codecs%': 0, diff --git a/build/config/features.gni b/build/config/features.gni index 8efa7cf..c965844 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -46,11 +46,9 @@ declare_args() { # Enables the Media Router. enable_media_router = !is_ios - # Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3. - # Android OS includes support for proprietary codecs regardless of building - # Chromium or Google Chrome. We also ship Google Chrome and Chromecast with - # proprietary codecs. - proprietary_codecs = is_android || is_chrome_branded || is_chromecast + # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. + # We always build Google Chrome and Chromecast with proprietary codecs. + proprietary_codecs = is_chrome_branded || is_chromecast enable_configuration_policy = !is_ios |