Avoid macro redefinition in tools_sanity_unittest.cc

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 3260 matching lines @@
               'WTF_USE_DYNAMIC_ANNOTATIONS=1',
             ],
           }],
           ['win_use_allocator_shim==0', {
             'defines': ['NO_TCMALLOC'],
           }],
           # _FORTIFY_SOURCE isn't really supported by Clang now, see
           # http://llvm.org/bugs/show_bug.cgi?id=16821.
           # It seems to work fine with Ubuntu 12 headers though, so use it
           # in official builds.
           ['os_posix==1 and (asan!=1 and msan!=1 and tsan!=1 and lsan!=1 and ubsan!=1) and (OS!="linux" or clang!=1 or buildtype=="Official")', {

[Nico, 2014/07/17 16:08:55]

This used to not be in a buildtype=="Official" section, and the _FORTIFY_SOURCE
is what required the warning flag below. So I think you probably want to move
the flag you're removing below to up here.

[tzik, 2014/07/17 17:29:05]

The -Wno-error flag was for asan==1 case, and this block seems to have asan!=1.
Shall I also update *san condition in this block to enable FORTIFY_SOURCE for
asan==1 && buildtype=="Official" case?

             'target_conditions': [
               ['chromium_code==1', {
                 # Non-chromium code is not guaranteed to compile cleanly
                 # with _FORTIFY_SOURCE. Also, fortified build may fail
                 # when optimizations are disabled, so only do that for Release
                 # build.
                 'defines': [
                   '_FORTIFY_SOURCE=2',
                 ],
               }],
@@ skipping 690 matching lines @@
                   '<(DEPTH)/base/base.gyp:sanitizer_options',
                 ],
               }],
             ],
           }],
           ['asan==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '-fsanitize=address',
-                  '-Wno-error=macro-redefined',  # http://crbug.com/162783
                 ],
                 'ldflags': [
                   '-fsanitize=address',
                 ],
               }],
             ],
             'conditions': [
               ['OS=="mac"', {
                 'cflags': [
                   '-mllvm -asan-globals=0',  # http://crbug.com/352073
                   '-Wno-error=unused-function',  # http://crbug.com/162783
                 ],
               }],
             ],
           }],
           ['ubsan==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '-fsanitize=undefined',
                   # -fsanitize=vptr is incompatible with -fno-rtti.
                   '-fno-sanitize=vptr',
-                  '-Wno-error=macro-redefined',  # http://crbug.com/162783
                 ],
                 'ldflags': [
                   '-fsanitize=undefined',
                   # -fsanitize=vptr is incompatible with -fno-rtti.
                   '-fno-sanitize=vptr',
                 ],
               }],
             ],
             'conditions': [
               ['OS=="mac"', {
                 'cflags': [
                   '-Wno-error=unused-function',  # http://crbug.com/162783
                 ],
               }],
             ],
           }],
           ['ubsan_vptr==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '-fsanitize=vptr',
                   '-fsanitize=null',  # Avoid dereferences on null pointer objects.
                   '-fsanitize-blacklist=<(ubsan_vptr_blacklist)',
-                  '-Wno-error=macro-redefined',  # http://crbug.com/162783
                 ],
                 'cflags_cc!': [
                   '-fno-rtti',
                 ],
                 'cflags!': [
                   '-fno-rtti',
                 ],
                 'ldflags': [
                   '-fsanitize=vptr',  # -fsanitize=null is not necessary.
                 ],
@@ skipping 575 matching lines @@
               }],
             ],
           }],
           # Settings for building host targets using the system toolchain.
           ['_toolset=="host"', {
             'cflags!': [
               # Due to issues in Clang build system, using ASan on 32-bit
               # binaries on x86_64 host is problematic.
               # TODO(eugenis): re-enable.
               '-fsanitize=address',
-              '-Wno-error=macro-redefined',  # http://crbug.com/162783
-
             ],
             'ldflags!': [
               '-fsanitize=address',
               '-Wl,-z,noexecstack',
               '-Wl,--gc-sections',
               '-Wl,-O1',
               '-Wl,--as-needed',
               '-Wl,--warn-shared-textrel',
               '-Wl,--fatal-warnings',
             ],
@@ skipping 149 matching lines @@
           ['clang==1', {
             'variables': {
               'clang_dir': '../third_party/llvm-build/Release+Asserts/bin',
             },
           }],
           ['asan==1', {
             'xcode_settings': {
               'OTHER_CFLAGS': [
                 '-fsanitize=address',
                 '-mllvm -asan-globals=0',  # http://crbug.com/352073
-                '-Wno-error=macro-redefined',  # http://crbug.com/162783
                 '-Wno-error=unused-function',  # http://crbug.com/162783
                 '-gline-tables-only',
               ],
             },
           }],
           ['asan_coverage!=0', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '-mllvm -asan-coverage=<(asan_coverage)',
@@ skipping 838 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',
   },
 }