diff options
| author | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:24:42 +0000 |
|---|---|---|
| committer | timurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:24:42 +0000 |
| commit | ee857513c3a0d5c88bfd363c4203d4190fc678f5 (patch) | |
| tree | 8e4ce0e72ced6eacd5711375f0a0d6bbe48c59a3 /build | |
| parent | d4db59c55fdf97bf3abd60c58824fc090e0a7b61 (diff) | |
| download | chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.zip chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.gz chromium_src-ee857513c3a0d5c88bfd363c4203d4190fc678f5.tar.bz2 | |
Update dynamic annotations and move them to base/third_party
Review URL: http://codereview.chromium.org/1992005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 6aad1932..f457a2b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -622,6 +622,7 @@ }, 'Debug_Base': { 'abstract': 1, + 'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'], 'xcode_settings': { 'COPY_PHASE_STRIP': 'NO', 'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', @@ -694,7 +695,9 @@ }, 'conditions': [ ['release_valgrind_build==0', { - 'defines': ['NVALGRIND'], + 'defines': ['NVALGRIND', 'DYNAMIC_ANNOTATIONS_ENABLED=0'], + }, { + 'defines': ['DYNAMIC_ANNOTATIONS_ENABLED=1'], }], ['win_use_allocator_shim==0', { 'defines': ['NO_TCMALLOC'], |