| 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 3978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3989 ], | 3989 ], |
| 3990 'ldflags': [ | 3990 'ldflags': [ |
| 3991 '-fsanitize=address', | 3991 '-fsanitize=address', |
| 3992 ], | 3992 ], |
| 3993 }], | 3993 }], |
| 3994 ], | 3994 ], |
| 3995 'conditions': [ | 3995 'conditions': [ |
| 3996 ['OS=="mac"', { | 3996 ['OS=="mac"', { |
| 3997 'cflags': [ | 3997 'cflags': [ |
| 3998 '-mllvm -asan-globals=0', # http://crbug.com/352073 | 3998 '-mllvm -asan-globals=0', # http://crbug.com/352073 |
| 3999 '-Wno-error=unused-function', # http://crbug.com/162783 | |
| 4000 ], | 3999 ], |
| 4001 }], | 4000 }], |
| 4002 ], | 4001 ], |
| 4003 }], | 4002 }], |
| 4004 ['ubsan==1', { | 4003 ['ubsan==1', { |
| 4005 'target_conditions': [ | 4004 'target_conditions': [ |
| 4006 ['_toolset=="target"', { | 4005 ['_toolset=="target"', { |
| 4007 'cflags': [ | 4006 'cflags': [ |
| 4008 '-fsanitize=undefined', | 4007 '-fsanitize=undefined', |
| 4009 # -fsanitize=vptr is incompatible with -fno-rtti. | 4008 # -fsanitize=vptr is incompatible with -fno-rtti. |
| 4010 '-fno-sanitize=vptr', | 4009 '-fno-sanitize=vptr', |
| 4011 ], | 4010 ], |
| 4012 'ldflags': [ | 4011 'ldflags': [ |
| 4013 '-fsanitize=undefined', | 4012 '-fsanitize=undefined', |
| 4014 # -fsanitize=vptr is incompatible with -fno-rtti. | 4013 # -fsanitize=vptr is incompatible with -fno-rtti. |
| 4015 '-fno-sanitize=vptr', | 4014 '-fno-sanitize=vptr', |
| 4016 ], | 4015 ], |
| 4017 }], | 4016 }], |
| 4018 ], | 4017 ], |
| 4019 'conditions': [ | |
| 4020 ['OS=="mac"', { | |
| 4021 'cflags': [ | |
| 4022 '-Wno-error=unused-function', # http://crbug.com/162783 | |
| 4023 ], | |
| 4024 }], | |
| 4025 ], | |
| 4026 }], | 4018 }], |
| 4027 ['ubsan_vptr==1', { | 4019 ['ubsan_vptr==1', { |
| 4028 'target_conditions': [ | 4020 'target_conditions': [ |
| 4029 ['_toolset=="target"', { | 4021 ['_toolset=="target"', { |
| 4030 'cflags': [ | 4022 'cflags': [ |
| 4031 '-fsanitize=vptr', | 4023 '-fsanitize=vptr', |
| 4032 '-fsanitize=null', # Avoid dereferences on null pointer objec
ts. | 4024 '-fsanitize=null', # Avoid dereferences on null pointer objec
ts. |
| 4033 '-fsanitize-blacklist=<(ubsan_vptr_blacklist)', | 4025 '-fsanitize-blacklist=<(ubsan_vptr_blacklist)', |
| 4034 ], | 4026 ], |
| 4035 'cflags_cc!': [ | 4027 'cflags_cc!': [ |
| 4036 '-fno-rtti', | 4028 '-fno-rtti', |
| 4037 ], | 4029 ], |
| 4038 'cflags!': [ | 4030 'cflags!': [ |
| 4039 '-fno-rtti', | 4031 '-fno-rtti', |
| 4040 ], | 4032 ], |
| 4041 'ldflags': [ | 4033 'ldflags': [ |
| 4042 '-fsanitize=vptr', # -fsanitize=null is not necessary. | 4034 '-fsanitize=vptr', # -fsanitize=null is not necessary. |
| 4043 ], | 4035 ], |
| 4044 'defines': [ | 4036 'defines': [ |
| 4045 'UNDEFINED_SANITIZER', | 4037 'UNDEFINED_SANITIZER', |
| 4046 ], | 4038 ], |
| 4047 }], | 4039 }], |
| 4048 ], | 4040 ], |
| 4049 'conditions': [ | |
| 4050 ['OS=="mac"', { | |
| 4051 'cflags': [ | |
| 4052 '-Wno-error=unused-function', # http://crbug.com/162783 | |
| 4053 ], | |
| 4054 }], | |
| 4055 ], | |
| 4056 }], | 4041 }], |
| 4057 ['asan_coverage!=0', { | 4042 ['asan_coverage!=0', { |
| 4058 'target_conditions': [ | 4043 'target_conditions': [ |
| 4059 ['_toolset=="target"', { | 4044 ['_toolset=="target"', { |
| 4060 'cflags': [ | 4045 'cflags': [ |
| 4061 '-mllvm -asan-coverage=<(asan_coverage)', | 4046 '-mllvm -asan-coverage=<(asan_coverage)', |
| 4062 ], | 4047 ], |
| 4063 }], | 4048 }], |
| 4064 ], | 4049 ], |
| 4065 }], | 4050 }], |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4629 ], | 4614 ], |
| 4630 'ldflags!': [ | 4615 'ldflags!': [ |
| 4631 '-fsanitize=address', | 4616 '-fsanitize=address', |
| 4632 '-Wl,-z,noexecstack', | 4617 '-Wl,-z,noexecstack', |
| 4633 '-Wl,--gc-sections', | 4618 '-Wl,--gc-sections', |
| 4634 '-Wl,-O1', | 4619 '-Wl,-O1', |
| 4635 '-Wl,--as-needed', | 4620 '-Wl,--as-needed', |
| 4636 '-Wl,--warn-shared-textrel', | 4621 '-Wl,--warn-shared-textrel', |
| 4637 '-Wl,--fatal-warnings', | 4622 '-Wl,--fatal-warnings', |
| 4638 ], | 4623 ], |
| 4639 'conditions': [ | |
| 4640 ['OS=="mac"', { | |
| 4641 'cflags!': [ | |
| 4642 '-Wno-error=unused-function', # http://crbug.com/162783 | |
| 4643 ], | |
| 4644 }], | |
| 4645 ], | |
| 4646 }], | 4624 }], |
| 4647 # Settings for building host targets on mac. | 4625 # Settings for building host targets on mac. |
| 4648 ['_toolset=="host" and host_os=="mac"', { | 4626 ['_toolset=="host" and host_os=="mac"', { |
| 4649 'ldflags!': [ | 4627 'ldflags!': [ |
| 4650 '-Wl,-z,now', | 4628 '-Wl,-z,now', |
| 4651 '-Wl,-z,relro', | 4629 '-Wl,-z,relro', |
| 4652 ], | 4630 ], |
| 4653 }], | 4631 }], |
| 4654 ], | 4632 ], |
| 4655 }, | 4633 }, |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4788 ['clang==1', { | 4766 ['clang==1', { |
| 4789 'variables': { | 4767 'variables': { |
| 4790 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', | 4768 'clang_dir': '../third_party/llvm-build/Release+Asserts/bin', |
| 4791 }, | 4769 }, |
| 4792 }], | 4770 }], |
| 4793 ['asan==1', { | 4771 ['asan==1', { |
| 4794 'xcode_settings': { | 4772 'xcode_settings': { |
| 4795 'OTHER_CFLAGS': [ | 4773 'OTHER_CFLAGS': [ |
| 4796 '-fsanitize=address', | 4774 '-fsanitize=address', |
| 4797 '-mllvm -asan-globals=0', # http://crbug.com/352073 | 4775 '-mllvm -asan-globals=0', # http://crbug.com/352073 |
| 4798 '-Wno-error=unused-function', # http://crbug.com/162783 | |
| 4799 '-gline-tables-only', | 4776 '-gline-tables-only', |
| 4800 ], | 4777 ], |
| 4801 }, | 4778 }, |
| 4802 }], | 4779 }], |
| 4803 ['asan_coverage!=0', { | 4780 ['asan_coverage!=0', { |
| 4804 'target_conditions': [ | 4781 'target_conditions': [ |
| 4805 ['_toolset=="target"', { | 4782 ['_toolset=="target"', { |
| 4806 'cflags': [ | 4783 'cflags': [ |
| 4807 '-mllvm -asan-coverage=<(asan_coverage)', | 4784 '-mllvm -asan-coverage=<(asan_coverage)', |
| 4808 ], | 4785 ], |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5646 # settings in target dicts. SYMROOT is a special case, because many other | 5623 # settings in target dicts. SYMROOT is a special case, because many other |
| 5647 # Xcode variables depend on it, including variables such as | 5624 # Xcode variables depend on it, including variables such as |
| 5648 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5625 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5649 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5626 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5650 # files to appear (when present) in the UI as actual files and not red | 5627 # files to appear (when present) in the UI as actual files and not red |
| 5651 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5628 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5652 # and therefore SYMROOT, needs to be set at the project level. | 5629 # and therefore SYMROOT, needs to be set at the project level. |
| 5653 'SYMROOT': '<(DEPTH)/xcodebuild', | 5630 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5654 }, | 5631 }, |
| 5655 } | 5632 } |
| OLD | NEW |