| Index: tools/cygprofile/cygprofile.gyp | 
| diff --git a/tools/cygprofile/cygprofile.gyp b/tools/cygprofile/cygprofile.gyp | 
| index cba5792fa19b8fa2028ef8ae0a4e1998895dd6e9..483b3f690ec0b8004817e0815a6c294408e96397 100644 | 
| --- a/tools/cygprofile/cygprofile.gyp | 
| +++ b/tools/cygprofile/cygprofile.gyp | 
| @@ -1,4 +1,4 @@ | 
| -# Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| +# Copyright (c) 2012 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. | 
|  | 
| @@ -10,11 +10,31 @@ | 
| 'target_name': 'cygprofile', | 
| 'type': 'static_library', | 
| 'include_dirs': [ '../..', ], | 
| +      'conditions': [ | 
| +        [ 'OS == "android"', { | 
| +          'sources': [ | 
| +            'cygprofile_android.h', | 
| +            'cygprofile_android.cc', | 
| +          ], | 
| +        }, | 
| +          {  # OS != "android" | 
| +          'sources': [ | 
| +            'cygprofile.cc', | 
| +          ], | 
| +          'cflags!': [ '-finstrument-functions' ], | 
| +          'cflags': [ '-std=c++0x' ],  # for unordered_set | 
| +        }], | 
| +      ], | 
| +    }, | 
| +    { | 
| +      'target_name': 'cygprofile_android_test', | 
| +      'type': 'executable', | 
| +      'dependencies': [ | 
| +        './cygprofile.gyp:cygprofile', | 
| +      ], | 
| 'sources': [ | 
| -        'cygprofile.cc', | 
| +        'cygprofile_android_unittest.cc', | 
| ], | 
| -      'cflags!': [ '-finstrument-functions' ], | 
| -      'cflags': [ '-std=c++0x' ],  # for unordered_set | 
| }, | 
| ], | 
| } | 
|  |