diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:04:48 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:04:48 +0000 |
| commit | d01120e6c225d4922d0f932ab6ef4f3709dcaa17 (patch) | |
| tree | 98a448a7adb6bc5a581861a4ff255d6bd5fb04aa /build | |
| parent | 3264fc3cf0162e1d2302b31afc55c8c3d7aef71d (diff) | |
| download | chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.zip chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.tar.gz chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.tar.bz2 | |
Added #ifdef to allow Chromium to enable proprietary codecs.
We need to enable MP4 and MP3 support on tegra2 boards. This change will let us enable this support via a flag in make.conf.
Patch by jneddo@nvidia.com:
http://codereview.chromium.org/1942003/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2001004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 05adc1a..6aad1932 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -189,6 +189,10 @@ # Whether usage of OpenMAX is enabled. 'enable_openmax%': 0, + # Whether proprietary audio/video codecs are assumed to be included with + # this build (only meaningful if branding!=Chrome). + 'proprietary_codecs%': 0, + # TODO(bradnelson): eliminate this when possible. # To allow local gyp files to prevent release.vsprops from being included. # Yes(1) means include release.vsprops. @@ -400,6 +404,9 @@ ['chromeos==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['proprietary_codecs==1', { + 'defines': ['USE_PROPRIETARY_CODECS'], + }], ['fastbuild!=0', { 'conditions': [ # Finally, for Windows, we simply turn on profiling. |