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

Unified Diff: gyp/common_conditions.gypi

Issue 371363004: Add SkRacy (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: check unique define + volatile Created 6 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
« no previous file with comments | « no previous file | include/core/SkDynamicAnnotations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index f7c463347d6b1fb7c67ac17ccd0707930b2d1ada..cc3aae4f91f3bbfd0b81688d5d33157a37b55032 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -447,7 +447,7 @@
],
'conditions' : [
[ 'skia_sanitizer == "thread"', {
- 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
+ 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ],
'cflags': [ '-fPIC' ],
'target_conditions': [
[ '_type == "executable"', {
« no previous file with comments | « no previous file | include/core/SkDynamicAnnotations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698