Upstream ChromeOS patch on O3D. (Change Icf3bc91d: http://gerrit.chromium.org/gerrit/#change,2220)

plugin/plugin.gyp

 # Copyright (c) 2009 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.
 
 # PLEASE NOTE: This file contains the targets for generating the
 # plugin two different ways -- once as a shared library, and once as a
 # static library.  The static library is only built if we are inside
 # of a Chrome tree, and it gets built with different defined symbols,
 # and without the packaging code on the Mac.  The shared library gets
 # built in an o3d tree, or in a chrome tree when built by an o3d
@@ skipping 293 matching lines @@
               '../breakpad/breakpad.gyp:o3dBreakpad',
             ],
             'sources': [
               'linux/config.cc',
               'linux/envvars.cc',
               'linux/main_linux.cc',
             ],
             'ldflags': [
               '-Wl,-znodelete',
               '-Wl,--gc-sections',
-              '<!@(pkg-config --libs-only-L xt)',
+              '<!@(<(pkg-config) --libs-only-L xt)',
               '<(as_needed_ldflags)',
               # Directs the linker to only generate dependencies on libraries
               # that we actually use. Must come last.
               '-Wl,--as-needed',
             ],
             'libraries': [
-              '<!@(pkg-config --libs-only-l xt)',
+              '<!@(<(pkg-config) --libs-only-l xt)',
             ],
             'conditions' : [
               ['plugin_rpath != ""',
                 {
                   'ldflags': [
                     '-Wl,-rpath', '-Wl,<(plugin_rpath)',
                   ],
                 },
               ],
               ['plugin_env_vars_file != ""',
@@ skipping 519 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: