diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 20:22:22 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 20:22:22 +0000 |
| commit | 0d841b7db3800f46189407c2fd0e04a72415c2de (patch) | |
| tree | f74aa2cf38d67e850fdcd51e528d64c53fac00e9 /build/common.gypi | |
| parent | 1407fe0bba44171c9365ed31238b698bf4d8e9c3 (diff) | |
| download | chromium_src-0d841b7db3800f46189407c2fd0e04a72415c2de.zip chromium_src-0d841b7db3800f46189407c2fd0e04a72415c2de.tar.gz chromium_src-0d841b7db3800f46189407c2fd0e04a72415c2de.tar.bz2 | |
Define proprietary_codecs=1 when branding==Chrome.
Doing so removes the redundant checks for GOOGLE_CHROME_BUILD when checking USE_PROPRIETARY_CODECS.
BUG=274596
Review URL: https://chromiumcodereview.appspot.com/23205006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 450b992..847d23c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -525,7 +525,6 @@ 'enable_google_now%': 0, 'enable_spellcheck%': 0, 'enable_themes%': 0, - 'proprietary_codecs%': 1, 'remoting%': 0, 'arm_neon%': 0, 'arm_neon_optional%': 1, @@ -533,8 +532,8 @@ 'native_memory_pressure_signals%': 1, }], - # Enable basic printing for Chrome for Android but disable printing - # completely for WebView. + # Enable basic printing for Chrome for Android but disable printing + # completely for WebView. ['OS=="android" and android_webview_build==0', { 'enable_printing%': 2, }], @@ -542,6 +541,13 @@ 'enable_printing%': 0, }], + # Android OS includes support for proprietary codecs regardless of + # building Chromium or Google Chrome. We also ship Google Chrome with + # proprietary codecs. + ['OS=="android" or branding=="Chrome"', { + 'proprietary_codecs%': 1, + }], + # Enable autofill dialog for Android, Mac and Views-enabled platforms. ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS=="mac"', { 'enable_autofill_dialog%': 1 |