diff options
| author | xhwang <xhwang@chromium.org> | 2015-12-18 15:31:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 23:32:14 +0000 |
| commit | fa2d9d4704677627af5c703fc4c04717f5425e4a (patch) | |
| tree | 8f7b31efd2f833693dedf762c3275e1603d7d377 /build/common.gypi | |
| parent | b20ddc225baad98ec82a50f1abceffca0a26c65a (diff) | |
| download | chromium_src-fa2d9d4704677627af5c703fc4c04717f5425e4a.zip chromium_src-fa2d9d4704677627af5c703fc4c04717f5425e4a.tar.gz chromium_src-fa2d9d4704677627af5c703fc4c04717f5425e4a.tar.bz2 | |
Switch from build-time to run-time flags for Project Spitzer.
Contributed by dalecurtis@chromium.org.
This puts the desktop media playback pipeline behind a runtime flag
for Android; previously this was a combination of build-time and
run-time flags to avoid introducing a binary size increase before
we were ready for experiments.
This change will result in a ~480kb apk size increase on Android that has been
approved via Chrome Eng Review and klobag@ from the Chrome for Android team.
http://crbug.com/570711 tracks this size increase and plans to reduce it in
the future.
It paves the way for unifying our playback stacks across platforms and brings
previously-missing features and improved security to Android playback. More
technical details can be found in the linked bug below and design doc:
https://goo.gl/qC3OuL
BUG=507834, 570711, 570762
TEST=builds with gn/gyp work with unified path.
TBR=grt@chromium.org,dpranke@chromium.org,liberato@chromium.org,creis@chromium.org
Review URL: https://codereview.chromium.org/1541513002
Cr-Commit-Position: refs/heads/master@{#366208}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index d829ae4..b41f890 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1882,7 +1882,6 @@ }], ['chromecast==1', { 'enable_mpeg2ts_stream_parser%': 1, - 'ffmpeg_branding%': 'ChromeOS', 'use_custom_freetype%': 0, 'use_playready%': 0, 'conditions': [ @@ -1891,6 +1890,11 @@ 'arm_tune%': 'cortex-a9', 'arm_thumb%': 1, }], + # TODO(dalecurtis): What audio codecs does Chromecast want here? Sort + # out and add configs if necessary. http://crbug.com/570754 + ['OS!="android"', { + 'ffmpeg_branding%': 'ChromeOS', + }], ], }], ['OS=="linux"', { |