diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 23:33:41 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 23:33:41 +0000 |
| commit | d80a0619f7f4a074ff68b5ff9dffba2fefde197f (patch) | |
| tree | 9dceecf0aa2e260c42938bc3e73179957c0289e0 | |
| parent | 0ed9480c6a0ac1a8cc75c7b421f64d421570f2ce (diff) | |
| download | chromium_src-d80a0619f7f4a074ff68b5ff9dffba2fefde197f.zip chromium_src-d80a0619f7f4a074ff68b5ff9dffba2fefde197f.tar.gz chromium_src-d80a0619f7f4a074ff68b5ff9dffba2fefde197f.tar.bz2 | |
Fix build/common.gypi to actually set proprietary_codecs when branding=Chrome.
The 'proprietary_codecs%': 0 declaration was overwriting the conditionally-set statement earlier in the file. Instead, move the 0 assignment into the else branch and copy the conditionally-set variable into the outer scope.
I fail at gyp.
BUG=277948
R=acolwell@chromium.org
Review URL: https://codereview.chromium.org/23090007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219379 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index e70eaac..8da93c5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -546,6 +546,8 @@ # proprietary codecs. ['OS=="android" or branding=="Chrome"', { 'proprietary_codecs%': 1, + }, { + 'proprietary_codecs%': 0, }], # Enable autofill dialog for Android, Mac and Views-enabled platforms. @@ -882,6 +884,7 @@ 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 'enable_mdns%' : '<(enable_mdns)', 'v8_optimized_debug': '<(v8_optimized_debug)', + 'proprietary_codecs%': '<(proprietary_codecs)', # Use system nspr instead of the bundled one. 'use_system_nspr%': 0, @@ -941,10 +944,6 @@ # to ~/.gyp/include.gypi, gclient runhooks --force, and do a release build. 'win_use_allocator_shim%': 1, # 1 = shim allocator via libcmt; 0 = msvcrt - # 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. |