summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 00:06:52 +0000
committerdalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 00:06:52 +0000
commit4e1272f40f7ca5832078d9d8ed4b5c875bfcb774 (patch)
treec82a367e0c530066a73fcb1dcfc8e7390900410d /media
parent63e916b0e66d4133a487853e77a9090942f80e95 (diff)
downloadchromium_src-4e1272f40f7ca5832078d9d8ed4b5c875bfcb774.zip
chromium_src-4e1272f40f7ca5832078d9d8ed4b5c875bfcb774.tar.gz
chromium_src-4e1272f40f7ca5832078d9d8ed4b5c875bfcb774.tar.bz2
Add dummy .c file to media_asm target.
Fixes xcode from complaining about an "empty" assembly only target. BUG=157073 TEST=compiles TBR=fischman Review URL: https://codereview.chromium.org/15724007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/simd/xcode_hack.c10
-rw-r--r--media/media.gyp6
2 files changed, 16 insertions, 0 deletions
diff --git a/media/base/simd/xcode_hack.c b/media/base/simd/xcode_hack.c
new file mode 100644
index 0000000..ee0b615
--- /dev/null
+++ b/media/base/simd/xcode_hack.c
@@ -0,0 +1,10 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// XCode doesn't want to link a pure assembly target and will fail
+// to link when it creates an empty file list. So add a dummy file
+// keep the linker happy. See http://crbug.com/157073
+int xcode_sucks() {
+ return 0;
+}
diff --git a/media/media.gyp b/media/media.gyp
index cf1e7f3..c73f09c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1217,6 +1217,12 @@
'-DMACHO',
],
},
+ 'sources': [
+ # XCode doesn't want to link a pure assembly target and will
+ # fail to link when it creates an empty file list. So add a
+ # dummy file keep the linker happy. See http://crbug.com/157073
+ 'base/simd/xcode_hack.c',
+ ],
}],
['os_posix==1 and OS!="mac"', {
'variables': {