summaryrefslogtreecommitdiffstats
path: root/third_party/zlib
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 11:23:08 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-30 11:23:08 +0000
commit795cde3d24bbe37039e415c45e947be6d95b0a28 (patch)
tree2b3a401352c71730fd3e90d7ac4db774077b7283 /third_party/zlib
parentc567b48d1af4239266f99c7c79611f07723b2704 (diff)
downloadchromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.zip
chromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.tar.gz
chromium_src-795cde3d24bbe37039e415c45e947be6d95b0a28.tar.bz2
Add yasm and ffmpeg into the build tree for linux.
BUG=22307 TEST=builds correctly, and an html5 video runs. Review URL: http://codereview.chromium.org/300013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r--third_party/zlib/zlib.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index c55ecb5..44e1f8b 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -58,7 +58,7 @@
},
'conditions': [
['OS!="win"', {
- 'product_name': 'z',
+ 'product_name': 'chrome_zlib',
'sources!': [
'contrib/minizip/iowin32.c'
],