roll gyp 1473:1479

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 734fa135754f8c709bc8701f508820be4ed53eaa..1f8b6eecc85c5f6f160b00de2af5adb0ce7bacaa 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2882,21 +2882,6 @@
               'OTHER_CFLAGS': [
                 '-faddress-sanitizer',
               ],
-              'OTHER_LDFLAGS': [
-                '-faddress-sanitizer',
-                # The symbols below are referenced in the ASan runtime
-                # library (compiled on OS X 10.6), but may be unavailable
-                # on the prior OS X versions. Because Chromium is currently
-                # targeting 10.5.0, we need to explicitly mark these
-                # symbols as dynamic_lookup.
-                '-Wl,-U,_malloc_default_purgeable_zone',
-                '-Wl,-U,_malloc_zone_memalign',
-                '-Wl,-U,_dispatch_sync_f',
-                '-Wl,-U,_dispatch_async_f',
-                '-Wl,-U,_dispatch_barrier_async_f',
-                '-Wl,-U,_dispatch_group_async_f',
-                '-Wl,-U,_dispatch_after_f',
-              ],
             },
             'defines': [
               'ADDRESS_SANITIZER',
@@ -2906,6 +2891,27 @@
         'target_conditions': [
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
+            'conditions': [
+              ['asan==1', {
+                'xcode_settings': {
+                  'OTHER_LDFLAGS': [
+                    '-faddress-sanitizer',
+                    # The symbols below are referenced in the ASan runtime
+                    # library (compiled on OS X 10.6), but may be unavailable
+                    # on the prior OS X versions. Because Chromium is
+                    # currently targeting 10.5.0, we need to explicitly mark
+                    # these symbols as dynamic_lookup.
+                    '-Wl,-U,_malloc_default_purgeable_zone',
+                    '-Wl,-U,_malloc_zone_memalign',
+                    '-Wl,-U,_dispatch_sync_f',
+                    '-Wl,-U,_dispatch_async_f',
+                    '-Wl,-U,_dispatch_barrier_async_f',
+                    '-Wl,-U,_dispatch_group_async_f',
+                    '-Wl,-U,_dispatch_after_f',
+                  ],
+                },
+              }],
+            ],
           }],
           ['_mac_bundle', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},