Clean up SkDynamicAnnotations.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
   ],
   'conditions' : [
@@ skipping 459 matching lines @@
           # Enable asan, tsan, etc.
           [ 'skia_sanitizer', {
             'cflags': [
               '-fsanitize=<(skia_sanitizer)',
             ],
             'ldflags': [
               '-fsanitize=<(skia_sanitizer)',
             ],
             'conditions' : [
               [ 'skia_sanitizer == "thread"', {
-                'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
+                'defines': [ 'THREAD_SANITIZER' ],
               }],
               [ 'skia_sanitizer == "undefined"', {
                 'cflags_cc!': ['-fno-rtti'],
               }],
             ],
           }],
           [ 'skia_clang_build', {
             'cflags_cc': [
                 '-Wno-unknown-warning-option',  # Allows unknown warnings.
                 '-Wno-deprecated',              # From Qt, via debugger (older Clang).
@@ skipping 168 matching lines @@
         # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
       ],
     }],
 
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }