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 1904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1915 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l | 1915 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm
l |
1916 'mac_release_optimization%': '3', # Use -O3 unless overridden | 1916 'mac_release_optimization%': '3', # Use -O3 unless overridden |
1917 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 1917 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
1918 }], | 1918 }], |
1919 ], | 1919 ], |
1920 }, | 1920 }, |
1921 'defines': [ | 1921 'defines': [ |
1922 # Set this to use the new DX11 version of ANGLE. | 1922 # Set this to use the new DX11 version of ANGLE. |
1923 # TODO(apatrick): Remove this when the transition is complete. | 1923 # TODO(apatrick): Remove this when the transition is complete. |
1924 'ANGLE_DX11', | 1924 'ANGLE_DX11', |
| 1925 'WTF_USE_SYSTEM_MALLOC=1', |
1925 ], | 1926 ], |
1926 'conditions': [ | 1927 'conditions': [ |
1927 ['(OS=="mac" or OS=="ios") and asan==1', { | 1928 ['(OS=="mac" or OS=="ios") and asan==1', { |
1928 'dependencies': [ | 1929 'dependencies': [ |
1929 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 1930 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
1930 ], | 1931 ], |
1931 }], | 1932 }], |
1932 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { | 1933 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { |
1933 'cflags_cc!': ['-fno-rtti'], | 1934 'cflags_cc!': ['-fno-rtti'], |
1934 'cflags_cc+': [ | 1935 'cflags_cc+': [ |
(...skipping 2814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4749 # settings in target dicts. SYMROOT is a special case, because many other | 4750 # settings in target dicts. SYMROOT is a special case, because many other |
4750 # Xcode variables depend on it, including variables such as | 4751 # Xcode variables depend on it, including variables such as |
4751 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4752 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4752 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4753 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4753 # files to appear (when present) in the UI as actual files and not red | 4754 # files to appear (when present) in the UI as actual files and not red |
4754 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4755 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4755 # and therefore SYMROOT, needs to be set at the project level. | 4756 # and therefore SYMROOT, needs to be set at the project level. |
4756 'SYMROOT': '<(DEPTH)/xcodebuild', | 4757 'SYMROOT': '<(DEPTH)/xcodebuild', |
4757 }, | 4758 }, |
4758 } | 4759 } |
OLD | NEW |