roll gyp 1473:1479

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 2864 matching lines @@
           ['clang==1', {
             'variables': {
               'clang_dir': '../third_party/llvm-build/Release+Asserts/bin',
             },
           }],
           ['asan==1', {
             'xcode_settings': {
               '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',
+              'target_conditions': [
+                ['_type!="static_library"', {
+                  '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',

[Nico, 2012/08/24 01:44:17]

glider: Can this be removed, now that we're 10.6+ only?

+                    ],
+                  },
+                }],
               ],
             },
             'defines': [
               'ADDRESS_SANITIZER',
             ],
           }],
         ],
         'target_conditions': [
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
@@ skipping 41 matching lines @@
                 'variables': {
                  'asan_saves_file': 'asan.saves',
                 },
                 'xcode_settings': {
                   'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)',
                 },
               }],
             ],
             'target_conditions': [
               ['mac_pie==1 and release_valgrind_build==0', {
-                # Turn on position-independence (ASLR) for executables. When
-                # PIE is on for the Chrome executables, the framework will
-                # also be subject to ASLR.
-                # Don't do this when building for Valgrind, because Valgrind
-                # doesn't understand slide. TODO: Make Valgrind on Mac OS X
-                # understand slide, and get rid of the Valgrind check.
-                'xcode_settings': {
-                  'OTHER_LDFLAGS': [
-                    '-Wl,-pie',  # Position-independent executable (MH_PIE)
-                  ],
-                },
+                'target_conditions': [
+                  ['_type!="static_library"', {
+                    'xcode_settings': {
+                      # Turn on position-independence (ASLR) for executables.
+                      # When PIE is on for the Chrome executables, the
+                      # framework will also be subject to ASLR.  Don't do this
+                      # when building for Valgrind, because Valgrind doesn't
+                      # understand slide. TODO: Make Valgrind on Mac OS X
+                      # understand slide, and get rid of the Valgrind check.
+                      'xcode_settings': {
+                        'OTHER_LDFLAGS': [
+                          '-Wl,-pie', # Position-independent executable (MH_PIE)
+                        ],
+                      },
+                    },
+                  }],
+                ],
               }],
             ],
           }],
           ['(_type=="executable" or _type=="shared_library" or \
              _type=="loadable_module") and mac_strip!=0', {
             'target_conditions': [
               ['mac_real_dsym == 1', {
                 # To get a real .dSYM bundle produced by dsymutil, set the
                 # debug information format to dwarf-with-dsym.  Since
                 # strip_from_xcode will not be used, set Xcode to do the
@@ skipping 414 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }