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

build/common.gypi

 # 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.
 
 {
   'variables': {
     'antlrdir': 'third_party/antlr3',
     'breakpaddir': 'breakpad/src',
     'cairodir': 'third_party/cairo',
     'fcolladadir': 'third_party/fcollada/files',
@@ skipping 62 matching lines @@
     'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py '
                       '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)',
     'selenium_screenshots%': 0,
 
     # Add a way to disable FBO support for GL implementations that don't have
     # it.
     'disable_fbo%': 0,
 
     # Whether to enable the English-only, Win/Mac-only fullscreen message.
     'plugin_enable_fullscreen_msg%': '1',
+
+    'conditions': [
+      [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {

[Tristan Schmelcher 2, 2011/06/07 23:39:47]

No leading space before the ' that starts the string.

[zhurunz1, 2011/06/07 23:58:54]

Done.

+        'conditions': [
+          ['sysroot!=""', {
+            'variables': {
+              'pkg-config%': '<(DEPTH)/o3d/build/linux/pkg-config-wrapper "<(sysroot)"',
+            },
+          }, {
+            'variables': {
+              'pkg-config%': 'pkg-config'
+            },
+          }],
+        ],
+      }],
+    ],
   },
   'target_defaults': {
     'defines': [
       'GYP_BUILD',  # Needed to make a change in base/types.h conditional.
     ],
     # This needs to be in a target_conditions block in order to successfully
     # override the xcode_settings in ../../build/common.gypi.
     # Something to do with evaluation order.
     'target_conditions': [
       ['OS=="mac"', {
@@ skipping 162 matching lines @@
             # We always want debugging information, even for release builds. It
             # is stripped by the packager into the -dbgsym package, so it
             # doesn't affect what we ship.
             '-g',
           ],
         },
       },
     ],
   ],
 }