diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2016-03-11 20:39:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 04:40:34 +0000 |
| commit | 8dd1542a877b87424e764ee495bd1ae6ade30492 (patch) | |
| tree | 86731c431078a17ba18db9dbb4a271e03b4b218c /build/common.gypi | |
| parent | 76311f1cf896615df4fa82b8421ae81cec9b7873 (diff) | |
| download | chromium_src-8dd1542a877b87424e764ee495bd1ae6ade30492.zip chromium_src-8dd1542a877b87424e764ee495bd1ae6ade30492.tar.gz chromium_src-8dd1542a877b87424e764ee495bd1ae6ade30492.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.
CQ_INCLUDE_TRYBOTS=tryserver.chromium.android:android_chromium_gn_rel
Review URL: https://codereview.chromium.org/1577433004
Cr-Commit-Position: refs/heads/master@{#380839}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index a73eb1b..32daaf2 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, |