| 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 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2000 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 2000 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 2001 }], | 2001 }], |
| 2002 ], | 2002 ], |
| 2003 }, | 2003 }, |
| 2004 'defines': [ | 2004 'defines': [ |
| 2005 # Set this to use the new DX11 version of ANGLE. | 2005 # Set this to use the new DX11 version of ANGLE. |
| 2006 # TODO(apatrick): Remove this when the transition is complete. | 2006 # TODO(apatrick): Remove this when the transition is complete. |
| 2007 'ANGLE_DX11', | 2007 'ANGLE_DX11', |
| 2008 ], | 2008 ], |
| 2009 'conditions': [ | 2009 'conditions': [ |
| 2010 # TODO(jochen): Enable this unconditionally. |
| 2011 ['OS!="mac"', { |
| 2012 'defines': ['V8_DEPRECATION_WARNINGS'], |
| 2013 }], |
| 2010 ['(OS=="mac" or OS=="ios") and asan==1', { | 2014 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 2011 'dependencies': [ | 2015 'dependencies': [ |
| 2012 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 2016 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 2013 ], | 2017 ], |
| 2014 }], | 2018 }], |
| 2015 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { | 2019 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { |
| 2016 'cflags_cc!': ['-fno-rtti'], | 2020 'cflags_cc!': ['-fno-rtti'], |
| 2017 'cflags_cc+': [ | 2021 'cflags_cc+': [ |
| 2018 '-frtti', | 2022 '-frtti', |
| 2019 '-gline-tables-only', | 2023 '-gline-tables-only', |
| (...skipping 2722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4742 # settings in target dicts. SYMROOT is a special case, because many other | 4746 # settings in target dicts. SYMROOT is a special case, because many other |
| 4743 # Xcode variables depend on it, including variables such as | 4747 # Xcode variables depend on it, including variables such as |
| 4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4748 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4749 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4746 # files to appear (when present) in the UI as actual files and not red | 4750 # files to appear (when present) in the UI as actual files and not red |
| 4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4751 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4748 # and therefore SYMROOT, needs to be set at the project level. | 4752 # and therefore SYMROOT, needs to be set at the project level. |
| 4749 'SYMROOT': '<(DEPTH)/xcodebuild', | 4753 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4750 }, | 4754 }, |
| 4751 } | 4755 } |
| OLD | NEW |