Chromium Code Reviews| 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 1817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1828 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l | 1828 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l |
| 1829 'mac_release_optimization%': '3', # Use -O3 unless overridden | 1829 'mac_release_optimization%': '3', # Use -O3 unless overridden |
| 1830 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 1830 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 1831 }], | 1831 }], |
| 1832 ], | 1832 ], |
| 1833 }, | 1833 }, |
| 1834 'defines': [ | 1834 'defines': [ |
| 1835 # Set this to use the new DX11 version of ANGLE. | 1835 # Set this to use the new DX11 version of ANGLE. |
| 1836 # TODO(apatrick): Remove this when the transition is complete. | 1836 # TODO(apatrick): Remove this when the transition is complete. |
| 1837 'ANGLE_DX11', | 1837 'ANGLE_DX11', |
| 1838 # TODO(enne): Remove this once #ifdefs using this have been removed. | |
|
jamesr
2013/07/09 23:45:27
oh yuck - i don't think you want to set a define f
enne (OOO)
2013/07/10 00:41:21
Thanks for the suggestion. I changed this to a gy
| |
| 1839 'BLINK_SCROLLING_POSITION_NO_OFFSET', | |
| 1838 ], | 1840 ], |
| 1839 'conditions': [ | 1841 'conditions': [ |
| 1840 ['(OS=="mac" or OS=="ios") and asan==1', { | 1842 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 1841 'dependencies': [ | 1843 'dependencies': [ |
| 1842 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 1844 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 1843 ], | 1845 ], |
| 1844 }], | 1846 }], |
| 1845 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { | 1847 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { |
| 1846 'cflags_cc!': ['-fno-rtti'], | 1848 'cflags_cc!': ['-fno-rtti'], |
| 1847 'cflags_cc+': [ | 1849 'cflags_cc+': [ |
| (...skipping 2776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4624 # settings in target dicts. SYMROOT is a special case, because many other | 4626 # settings in target dicts. SYMROOT is a special case, because many other |
| 4625 # Xcode variables depend on it, including variables such as | 4627 # Xcode variables depend on it, including variables such as |
| 4626 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4628 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4627 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4629 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4628 # files to appear (when present) in the UI as actual files and not red | 4630 # files to appear (when present) in the UI as actual files and not red |
| 4629 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4631 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4630 # and therefore SYMROOT, needs to be set at the project level. | 4632 # and therefore SYMROOT, needs to be set at the project level. |
| 4631 'SYMROOT': '<(DEPTH)/xcodebuild', | 4633 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4632 }, | 4634 }, |
| 4633 } | 4635 } |
| OLD | NEW |