| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 # IMPORTANT: | 5 # IMPORTANT: | 
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, | 
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. | 
| 8 { | 8 { | 
| 9   # Variables expected to be overriden on the GYP command line (-D) or by | 9   # Variables expected to be overriden on the GYP command line (-D) or by | 
| 10   # ~/.gyp/include.gypi. | 10   # ~/.gyp/include.gypi. | 
| (...skipping 3496 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3507         'variables': { | 3507         'variables': { | 
| 3508           'werror%': '-Werror', | 3508           'werror%': '-Werror', | 
| 3509           'libraries_for_target%': '', | 3509           'libraries_for_target%': '', | 
| 3510         }, | 3510         }, | 
| 3511         'defines': [ | 3511         'defines': [ | 
| 3512           '_FILE_OFFSET_BITS=64', | 3512           '_FILE_OFFSET_BITS=64', | 
| 3513         ], | 3513         ], | 
| 3514         'cflags': [ | 3514         'cflags': [ | 
| 3515           '<(werror)',  # See note above about the werror variable. | 3515           '<(werror)',  # See note above about the werror variable. | 
| 3516           '-pthread', | 3516           '-pthread', | 
|  | 3517           '-fno-exceptions', | 
| 3517           '-fno-strict-aliasing',  # See http://crbug.com/32204 | 3518           '-fno-strict-aliasing',  # See http://crbug.com/32204 | 
| 3518           '-Wall', | 3519           '-Wall', | 
| 3519           # TODO(evan): turn this back on once all the builds work. | 3520           # TODO(evan): turn this back on once all the builds work. | 
| 3520           # '-Wextra', | 3521           # '-Wextra', | 
| 3521           # Don't warn about unused function params.  We use those everywhere. | 3522           # Don't warn about unused function params.  We use those everywhere. | 
| 3522           '-Wno-unused-parameter', | 3523           '-Wno-unused-parameter', | 
| 3523           # Don't warn about the "struct foo f = {0};" initialization pattern. | 3524           # Don't warn about the "struct foo f = {0};" initialization pattern. | 
| 3524           '-Wno-missing-field-initializers', | 3525           '-Wno-missing-field-initializers', | 
| 3525           # Don't export any symbols (for example, to plugins we dlopen()). | 3526           # Don't export any symbols (for example, to plugins we dlopen()). | 
| 3526           # Note: this is *required* to make some plugins work. | 3527           # Note: this is *required* to make some plugins work. | 
| 3527           '-fvisibility=hidden', | 3528           '-fvisibility=hidden', | 
| 3528           '-pipe', | 3529           '-pipe', | 
| 3529         ], | 3530         ], | 
| 3530         'cflags_cc': [ | 3531         'cflags_cc': [ | 
| 3531           '-fno-rtti', | 3532           '-fno-rtti', | 
| 3532           '-fno-exceptions', |  | 
| 3533           '-fno-threadsafe-statics', | 3533           '-fno-threadsafe-statics', | 
| 3534           # Make inline functions have hidden visiblity by default. | 3534           # Make inline functions have hidden visiblity by default. | 
| 3535           # Surprisingly, not covered by -fvisibility=hidden. | 3535           # Surprisingly, not covered by -fvisibility=hidden. | 
| 3536           '-fvisibility-inlines-hidden', | 3536           '-fvisibility-inlines-hidden', | 
| 3537           # GCC turns on -Wsign-compare for C++ under -Wall, but clang doesn't, | 3537           # GCC turns on -Wsign-compare for C++ under -Wall, but clang doesn't, | 
| 3538           # so we specify it explicitly.  (llvm.org/PR10448, crbug.com/90453) | 3538           # so we specify it explicitly.  (llvm.org/PR10448, crbug.com/90453) | 
| 3539           '-Wsign-compare', | 3539           '-Wsign-compare', | 
| 3540         ], | 3540         ], | 
| 3541         'ldflags': [ | 3541         'ldflags': [ | 
| 3542           '-pthread', '-Wl,-z,noexecstack', | 3542           '-pthread', '-Wl,-z,noexecstack', | 
| (...skipping 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5789     # settings in target dicts.  SYMROOT is a special case, because many other | 5789     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5790     # Xcode variables depend on it, including variables such as | 5790     # Xcode variables depend on it, including variables such as | 
| 5791     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5791     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5792     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5792     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5793     # files to appear (when present) in the UI as actual files and not red | 5793     # files to appear (when present) in the UI as actual files and not red | 
| 5794     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5794     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5795     # and therefore SYMROOT, needs to be set at the project level. | 5795     # and therefore SYMROOT, needs to be set at the project level. | 
| 5796     'SYMROOT': '<(DEPTH)/xcodebuild', | 5796     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5797   }, | 5797   }, | 
| 5798 } | 5798 } | 
| OLD | NEW | 
|---|