diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 10:02:56 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 10:02:56 +0000 |
| commit | 23f991a603b837fbff921270a2998872f1eefb1e (patch) | |
| tree | ce93632fa331236b4c36e0caae563f3261920a11 /third_party/yasm | |
| parent | 7741f59740e04ad1e8e375b3de6a93f2860c26d4 (diff) | |
| download | chromium_src-23f991a603b837fbff921270a2998872f1eefb1e.zip chromium_src-23f991a603b837fbff921270a2998872f1eefb1e.tar.gz chromium_src-23f991a603b837fbff921270a2998872f1eefb1e.tar.bz2 | |
Exclude ffmpeg from the build when building for Android.
Conditionalize the ffmpeg dependency and exclude files which rely on it
for the media and media_unittest targets. Disable the ffmpeg_unittests,
ffmpeg_tests and media_bench for Android targets as they require it.
This change also conditionalizes the inclusion of yasm_compile.gyp, as
yasm is only used for the ia32 and x86 target architectures.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7977023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/yasm_compile.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/yasm/yasm_compile.gypi b/third_party/yasm/yasm_compile.gypi index 85948de..f9175e7 100644 --- a/third_party/yasm/yasm_compile.gypi +++ b/third_party/yasm/yasm_compile.gypi @@ -26,7 +26,9 @@ { 'variables': { + 'yasm_flags': [], 'yasm_path': '<(PRODUCT_DIR)/yasm', + 'conditions': [ # Define yasm_flags that pass into YASM. [ 'OS=="linux" and target_arch=="ia32"', { @@ -57,11 +59,10 @@ }], # Define output extension. - ['OS=="mac" or OS=="linux"', { - 'asm_obj_extension': 'o', - }], ['OS=="win"', { 'asm_obj_extension': 'obj', + }, { + 'asm_obj_extension': 'o', }], ], }, # variables |