| 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 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2128 'mac_debug_optimization%': '0', # Use -O0 unless overridden | 2128 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
| 2129 }], | 2129 }], |
| 2130 ['OS=="android"', { | 2130 ['OS=="android"', { |
| 2131 'host_os%': '<(host_os)', # See comment above chromium_code. | 2131 'host_os%': '<(host_os)', # See comment above chromium_code. |
| 2132 }], | 2132 }], |
| 2133 ], | 2133 ], |
| 2134 }, | 2134 }, |
| 2135 'defines': [ | 2135 'defines': [ |
| 2136 # Don't use deprecated V8 APIs anywhere. | 2136 # Don't use deprecated V8 APIs anywhere. |
| 2137 'V8_DEPRECATION_WARNINGS', | 2137 'V8_DEPRECATION_WARNINGS', |
| 2138 # Temporary suppression until Blink code can be removed. | |
| 2139 'BLINK_SCALE_FILTERS_AT_RECORD_TIME', | |
| 2140 ], | 2138 ], |
| 2141 'conditions': [ | 2139 'conditions': [ |
| 2142 ['(OS=="mac" or OS=="ios") and asan==1', { | 2140 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 2143 'dependencies': [ | 2141 'dependencies': [ |
| 2144 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 2142 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 2145 ], | 2143 ], |
| 2146 }], | 2144 }], |
| 2147 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 2145 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
| 2148 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcma
lloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)) and cla
ng_type_profiler==1', { | 2146 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcma
lloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)) and cla
ng_type_profiler==1', { |
| 2149 'cflags_cc!': ['-fno-rtti'], | 2147 'cflags_cc!': ['-fno-rtti'], |
| (...skipping 2903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5053 # settings in target dicts. SYMROOT is a special case, because many other | 5051 # settings in target dicts. SYMROOT is a special case, because many other |
| 5054 # Xcode variables depend on it, including variables such as | 5052 # Xcode variables depend on it, including variables such as |
| 5055 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5053 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5056 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5054 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5057 # files to appear (when present) in the UI as actual files and not red | 5055 # files to appear (when present) in the UI as actual files and not red |
| 5058 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5056 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5059 # and therefore SYMROOT, needs to be set at the project level. | 5057 # and therefore SYMROOT, needs to be set at the project level. |
| 5060 'SYMROOT': '<(DEPTH)/xcodebuild', | 5058 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5061 }, | 5059 }, |
| 5062 } | 5060 } |
| OLD | NEW |