Linux: fix compatibility with libwebp-0.3 for use_system_libwebp=1 case.

R=jzern
TBR=darin
BUG=none

Review URL: https://codereview.chromium.org/14328020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195016 0039d316-1c4b-4281-b951-d872f2087c98

third_party/libwebp/libwebp.gyp

@@ -162,7 +162,13 @@
           },
           'link_settings': {
             'libraries': [
-              '-lwebp',
+              # Check for presence of webpdemux library, use it if present.
+              '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+              '--code "int main() { return 0; }" '
+              '--run-linker '
+              '--on-success "-lwebp -lwebpdemux" '
+              '--on-failure "-lwebp" '
+              '-- -lwebpdemux)',
             ],
           },
         }

tools/compile_test/compile_test.py

@@ -21,6 +21,7 @@ import tempfile
 def DoMain(argv):
   parser = optparse.OptionParser()
   parser.add_option('--code')
+  parser.add_option('--run-linker', action='store_true')
   parser.add_option('--on-success', default='')
   parser.add_option('--on-failure', default='')
 
@@ -39,7 +40,12 @@ def DoMain(argv):
 
     o_path = os.path.join(tmpdir, 'test.o')
 
-    cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
+    cxx_cmdline = [cxx, cxx_path, '-o', o_path]
+    if not options.run_linker:
+      cxx_cmdline.append('-c')
+    # Pass remaining arguments to the compiler.
+    cxx_cmdline += args
+    cxx_popen = subprocess.Popen(cxx_cmdline,
                                  stdout=subprocess.PIPE,
                                  stderr=subprocess.PIPE)
     cxx_stdout, cxx_stderr = cxx_popen.communicate()