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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 1992005: Update dynamic annotations and move them to base/third_party (Closed)
Patch Set: rebased Created 10 years, 7 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
« no previous file with comments | « base/tools_sanity_unittest.cc ('k') | chrome/browser/geolocation/wifi_data_provider_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6aad19325c20f5db52f73e155b51b654733d7b79..f457a2b20fd4f86a09fe299eeb4242630e77c713 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'],
« no previous file with comments | « base/tools_sanity_unittest.cc ('k') | chrome/browser/geolocation/wifi_data_provider_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698