Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / supplement.gypi

diff --git a/src/third_party/webrtc/supplement.gypi b/src/third_party/webrtc/supplement.gypi
index 0a10cbc..4bf8598 100644 (file)
--- a/src/third_party/webrtc/supplement.gypi
+++ b/src/third_party/webrtc/supplement.gypi
@@ -5,17 +5,20 @@
     },
     'webrtc_root%': '<(webrtc_root)',
     'build_with_chromium': 0,
-    'use_sanitizer_options': 0,
   },
   'target_defaults': {
-    'conditions': [
-      # Add default sanitizer options similar to Chromium. This cannot be
-      # put in webrtc/build/common.gypi since that file is not included by
-      # third party code (yasm will throw leak errors during compile when
-      # GYP_DEFINES="asan=1".
-      ['OS=="linux" and (chromeos==0 or target_arch!="ia32")', {
-        'dependencies': [
-          '<(webrtc_root)/build/sanitizer_options.gyp:sanitizer_options',
+    'target_conditions': [
+      ['_target_name=="sanitizer_options"', {
+        'conditions': [
+          ['tsan==1', {
+            # Replace Chromium's TSan v2 suppressions with our own for WebRTC.
+            'sources/': [
+              ['exclude', 'tsan_suppressions.cc'],
+            ],
+            'sources': [
+              '<(webrtc_root)/build/tsan_suppressions_webrtc.cc',
+            ],
+          }],
         ],
       }],
     ],