summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 06:23:03 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 06:23:03 +0000
commit5cea38a320c3f2e204328cabfb34ab39581e19b5 (patch)
tree56706a813b99af45cdefca18f66163911659dde0 /media/media.gyp
parentdbb27cb4b1b1812e4e802df049965177283c69b7 (diff)
downloadchromium_src-5cea38a320c3f2e204328cabfb34ab39581e19b5.zip
chromium_src-5cea38a320c3f2e204328cabfb34ab39581e19b5.tar.gz
chromium_src-5cea38a320c3f2e204328cabfb34ab39581e19b5.tar.bz2
Fix a build break on ARM.
This change just moves my new test (added by r100352) to an archtecture-specific block to prevent building it on ARM. TBR=hclam BUG=none TEST=fix the build break on the ARM bot. Review URL: http://codereview.chromium.org/7857025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp
index dfe4bbf..5282afb 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -514,7 +514,6 @@
'base/pts_stream_unittest.cc',
'base/run_all_unittests.cc',
'base/seekable_buffer_unittest.cc',
- 'base/simd/convert_rgb_to_yuv_unittest.cc',
'base/state_matrix_unittest.cc',
'base/test_data_util.cc',
'base/test_data_util.h',
@@ -549,6 +548,11 @@
}],
],
}],
+ [ 'target_arch=="ia32" or target_arch=="x64"', {
+ 'sources': [
+ 'base/simd/convert_rgb_to_yuv_unittest.cc',
+ ],
+ }],
],
},
{