| Index: common.gypi | 
| =================================================================== | 
| --- a/common.gypi | 
| +++ b/common.gypi | 
| @@ -3,25 +3,32 @@ | 
| 'visibility%': 'hidden', | 
| 'library%': 'static_library', | 
| 'component%': '', | 
| 'want_separate_host_toolset': 0, | 
| }, | 
|  | 
| 'conditions': [ | 
| ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 
| -       or OS=="netbsd"', { | 
| +       or OS=="netbsd" or OS=="android"', { | 
| 'target_defaults': { | 
| 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', | 
| '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', | 
| -                    '-pedantic', | 
| -                    # Ignore some warnings for googletest | 
| -                    '-Wno-error=long-long', '-Wno-error=variadic-macros', | 
| -                    '-Wno-error=missing-field-initializers' ], | 
| +                    '-pedantic', '-std=c++0x', '-fexceptions', ], | 
| 'ldflags': [ '-pthread', ], | 
| }, | 
| }], | 
| +    ['OS=="android"', { | 
| +      'target_defaults': { | 
| +        'cflags!': [ | 
| +          '-pthread',  # Not supported by Android toolchain. | 
| +        ], | 
| +        'ldflags!': [ | 
| +          '-pthread',  # Not supported by Android toolchain. | 
| +        ], | 
| +      }, | 
| +    }], | 
| ], | 
|  | 
| 'target_defaults': { | 
| 'msvs_cygwin_shell': 0, | 
| } | 
| } | 
|  |