diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 22:10:27 +0000 |
| commit | e0d0014eb45448bf6bc59d905707d242f7517ba6 (patch) | |
| tree | 1030df65cda3e16b32a2aa1efcf688f95d89e3e6 /build | |
| parent | d8aea60122ca0a50a63de1bc3ab9673086c0e59d (diff) | |
| download | chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.zip chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.gz chromium_src-e0d0014eb45448bf6bc59d905707d242f7517ba6.tar.bz2 | |
Update ffmpeg binaries directories to support variants based off the target architecture.
BUG=20948
TEST=none
Review URL: http://codereview.chromium.org/215016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 78c62ad..23b5173 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -35,6 +35,9 @@ # builds). 'buildtype%': 'Dev', + # The architecture that we're building on. + 'target_arch%': 'ia32', + # We do want to build Chromium with Breakpad support in certain # situations. I.e. for Chrome bot. 'linux_chromium_breakpad%': 0, @@ -44,6 +47,7 @@ # variables sub-dict above, unless overridden. 'branding%': '<(branding)', 'buildtype%': '<(buildtype)', + 'target_arch%': '<(target_arch)', # Override chromium_mac_pch and set it to 0 to suppress the use of # precompiled headers on the Mac. Prefix header injection may still be @@ -114,9 +118,6 @@ # but that doesn't work as we'd like. 'msvs_debug_link_incremental%': '2', - # The architecture that we're building on. - 'target_arch%': 'ia32', - # By default linux does not use views. To turn on views in Linux # set the variable GYP_DEFINES to "toolkit_views=1", or modify # ~/.gyp/include.gypi . |