Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: tools/cygprofile/cygprofile.gyp

Issue 10697079: Upstreaming Cygprofile for Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
},
],
}

Powered by Google App Engine
This is Rietveld 408576698