diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2016-03-11 13:14:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 21:16:34 +0000 |
| commit | 2ceccae6337cab6b6d5be02413c2b56ebaebca1b (patch) | |
| tree | 88f8e562d58bd94f61eae94025d02f9debd08c51 /build/common.gypi | |
| parent | ec5d9a515fbff8e2898c26f4356ca1339d9eb987 (diff) | |
| download | chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.zip chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.tar.gz chromium_src-2ceccae6337cab6b6d5be02413c2b56ebaebca1b.tar.bz2 | |
Revert of Flip proprietary codecs to false for Android chromium builds. (patchset #11 id:220001 of https://codereview.chromium.org/1577433004/ )
Reason for revert:
Broke AndroidWebViewTest. See https://build.chromium.org/p/chromium.linux/builders/Android%20GN
Original issue's description:
> 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.
>
> Committed: https://crrev.com/43631fe1435e3c79467550b2cf797383d4cba8e6
> Cr-Commit-Position: refs/heads/master@{#380649}
TBR=boliu@chromium.org,ddorwin@chromium.org,dpranke@chromium.org,nyquist@chromium.org,dalecurtis@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=570762
Review URL: https://codereview.chromium.org/1785173005
Cr-Commit-Position: refs/heads/master@{#380731}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 32daaf2..a73eb1b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -833,9 +833,10 @@ 'use_browser_spellchecker%': 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', { + # 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', { 'proprietary_codecs%': 1, }, { 'proprietary_codecs%': 0, |