From 2ceccae6337cab6b6d5be02413c2b56ebaebca1b Mon Sep 17 00:00:00 2001 From: pkotwicz Date: Fri, 11 Mar 2016 13:14:54 -0800 Subject: 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} --- build/common.gypi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build/common.gypi') 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, -- cgit v1.1