summaryrefslogtreecommitdiffstats
path: root/build/android
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2016-03-11 20:39:32 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-12 04:40:34 +0000
commit8dd1542a877b87424e764ee495bd1ae6ade30492 (patch)
tree86731c431078a17ba18db9dbb4a271e03b4b218c /build/android
parent76311f1cf896615df4fa82b8421ae81cec9b7873 (diff)
downloadchromium_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/android')
-rwxr-xr-xbuild/android/gyp/apkbuilder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py
index cba311f..3661913 100755
--- a/build/android/gyp/apkbuilder.py
+++ b/build/android/gyp/apkbuilder.py
@@ -21,7 +21,7 @@ _NO_COMPRESS_EXTENSIONS = ('.jpg', '.jpeg', '.png', '.gif', '.wav', '.mp2',
'.mp3', '.ogg', '.aac', '.mpg', '.mpeg', '.mid',
'.midi', '.smf', '.jet', '.rtttl', '.imy', '.xmf',
'.mp4', '.m4a', '.m4v', '.3gp', '.3gpp', '.3g2',
- '.3gpp2', '.amr', '.awb', '.wma', '.wmv')
+ '.3gpp2', '.amr', '.awb', '.wma', '.wmv', '.webm')
def _ParseArgs(args):