| 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 2798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2809 'ldflags': [ | 2809 'ldflags': [ |
| 2810 '-Wl,--fatal-warnings', | 2810 '-Wl,--fatal-warnings', |
| 2811 # Only link with needed input sections. This is to avoid | 2811 # Only link with needed input sections. This is to avoid |
| 2812 # getting undefined reference to __cxa_bad_typeid in the CDU | 2812 # getting undefined reference to __cxa_bad_typeid in the CDU |
| 2813 # library. | 2813 # library. |
| 2814 '-Wl,--gc-sections', | 2814 '-Wl,--gc-sections', |
| 2815 # Warn in case of text relocations. | 2815 # Warn in case of text relocations. |
| 2816 '-Wl,--warn-shared-textrel', | 2816 '-Wl,--warn-shared-textrel', |
| 2817 ], | 2817 ], |
| 2818 }], | 2818 }], |
| 2819 ['OS=="android" and android_webview_build==1', { | |
| 2820 'ldflags!': [ | |
| 2821 # Must not turn on --fatal-warnings or warn-shared-textrel, | |
| 2822 # see crbug.com/157326. | |
| 2823 '-Wl,--fatal-warnings', | |
| 2824 '-Wl,--warn-shared-textrel', | |
| 2825 ], | |
| 2826 }], | |
| 2827 ['OS=="android" and android_full_debug==0', { | 2819 ['OS=="android" and android_full_debug==0', { |
| 2828 # Some configurations are copied from Release_Base to reduce | 2820 # Some configurations are copied from Release_Base to reduce |
| 2829 # the binary size. | 2821 # the binary size. |
| 2830 'variables': { | 2822 'variables': { |
| 2831 'debug_optimize%': 's', | 2823 'debug_optimize%': 's', |
| 2832 }, | 2824 }, |
| 2833 'cflags': [ | 2825 'cflags': [ |
| 2834 '-fomit-frame-pointer', | 2826 '-fomit-frame-pointer', |
| 2835 '-fdata-sections', | 2827 '-fdata-sections', |
| 2836 '-ffunction-sections', | 2828 '-ffunction-sections', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2890 }, | 2882 }, |
| 2891 'cflags': [ | 2883 'cflags': [ |
| 2892 '-fomit-frame-pointer', | 2884 '-fomit-frame-pointer', |
| 2893 ], | 2885 ], |
| 2894 'ldflags': [ | 2886 'ldflags': [ |
| 2895 '-Wl,--fatal-warnings', | 2887 '-Wl,--fatal-warnings', |
| 2896 # Warn in case of text relocations. | 2888 # Warn in case of text relocations. |
| 2897 '-Wl,--warn-shared-textrel', | 2889 '-Wl,--warn-shared-textrel', |
| 2898 ], | 2890 ], |
| 2899 }], | 2891 }], |
| 2900 ['OS=="android" and android_webview_build==1', { | |
| 2901 'ldflags!': [ | |
| 2902 # Must not turn on --fatal-warnings or | |
| 2903 # shared-text-rel, see crbug.com/157326. | |
| 2904 '-Wl,--fatal-warnings', | |
| 2905 '-Wl,--warn-shared-textrel', | |
| 2906 ], | |
| 2907 }], | |
| 2908 ['clang==1', { | 2892 ['clang==1', { |
| 2909 'cflags!': [ | 2893 'cflags!': [ |
| 2910 '-fno-ident', | 2894 '-fno-ident', |
| 2911 ], | 2895 ], |
| 2912 }], | 2896 }], |
| 2913 ['profiling==1', { | 2897 ['profiling==1', { |
| 2914 'cflags': [ | 2898 'cflags': [ |
| 2915 '-fno-omit-frame-pointer', | 2899 '-fno-omit-frame-pointer', |
| 2916 '-g', | 2900 '-g', |
| 2917 ], | 2901 ], |
| (...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3801 # TODO(eugenis): re-enable. | 3785 # TODO(eugenis): re-enable. |
| 3802 '-fsanitize=address', | 3786 '-fsanitize=address', |
| 3803 '-w', # http://crbug.com/162783 | 3787 '-w', # http://crbug.com/162783 |
| 3804 ], | 3788 ], |
| 3805 'ldflags!': [ | 3789 'ldflags!': [ |
| 3806 '-fsanitize=address', | 3790 '-fsanitize=address', |
| 3807 '-Wl,-z,noexecstack', | 3791 '-Wl,-z,noexecstack', |
| 3808 '-Wl,--gc-sections', | 3792 '-Wl,--gc-sections', |
| 3809 '-Wl,-O1', | 3793 '-Wl,-O1', |
| 3810 '-Wl,--as-needed', | 3794 '-Wl,--as-needed', |
| 3795 '-Wl,--warn-shared-textrel', |
| 3796 '-Wl,--fatal-warnings', |
| 3811 ], | 3797 ], |
| 3812 }], | 3798 }], |
| 3813 # Settings for building host targets on mac. | 3799 # Settings for building host targets on mac. |
| 3814 ['_toolset=="host" and host_os=="mac"', { | 3800 ['_toolset=="host" and host_os=="mac"', { |
| 3815 'ldflags!': [ | 3801 'ldflags!': [ |
| 3816 '-Wl,-z,now', | 3802 '-Wl,-z,now', |
| 3817 '-Wl,-z,relro', | 3803 '-Wl,-z,relro', |
| 3818 ], | 3804 ], |
| 3819 }], | 3805 }], |
| 3820 ], | 3806 ], |
| (...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4714 # settings in target dicts. SYMROOT is a special case, because many other | 4700 # settings in target dicts. SYMROOT is a special case, because many other |
| 4715 # Xcode variables depend on it, including variables such as | 4701 # Xcode variables depend on it, including variables such as |
| 4716 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4702 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4717 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4703 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4718 # files to appear (when present) in the UI as actual files and not red | 4704 # files to appear (when present) in the UI as actual files and not red |
| 4719 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4705 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4720 # and therefore SYMROOT, needs to be set at the project level. | 4706 # and therefore SYMROOT, needs to be set at the project level. |
| 4721 'SYMROOT': '<(DEPTH)/xcodebuild', | 4707 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4722 }, | 4708 }, |
| 4723 } | 4709 } |
| OLD | NEW |