Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Side by Side Diff: build/common.gypi

Issue 12939022: Remove USE_SKIA define. It is no longer used anywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1672 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1672 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1673 'mac_release_optimization%': 's', # Use -Os unless overridden 1673 'mac_release_optimization%': 's', # Use -Os unless overridden
1674 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1674 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1675 }, { 1675 }, {
1676 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l 1676 # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.htm l
1677 'mac_release_optimization%': '3', # Use -O3 unless overridden 1677 'mac_release_optimization%': '3', # Use -O3 unless overridden
1678 'mac_debug_optimization%': '0', # Use -O0 unless overridden 1678 'mac_debug_optimization%': '0', # Use -O0 unless overridden
1679 }], 1679 }],
1680 ], 1680 ],
1681 }, 1681 },
1682 # TODO(teravest): Remove this define once uses of USE_SKIA are cleaned up
1683 # throughout the codebase.
1684 'defines' : ['USE_SKIA'],
1685 'conditions': [ 1682 'conditions': [
1686 ['(OS=="mac" or OS=="ios") and asan==1', { 1683 ['(OS=="mac" or OS=="ios") and asan==1', {
1687 'dependencies': [ 1684 'dependencies': [
1688 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', 1685 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
1689 ], 1686 ],
1690 }], 1687 }],
1691 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', { 1688 ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
1692 'cflags_cc!': ['-fno-rtti'], 1689 'cflags_cc!': ['-fno-rtti'],
1693 'cflags_cc+': [ 1690 'cflags_cc+': [
1694 '-frtti', 1691 '-frtti',
(...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after
4176 # settings in target dicts. SYMROOT is a special case, because many other 4173 # settings in target dicts. SYMROOT is a special case, because many other
4177 # Xcode variables depend on it, including variables such as 4174 # Xcode variables depend on it, including variables such as
4178 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4175 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4179 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4176 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4180 # files to appear (when present) in the UI as actual files and not red 4177 # files to appear (when present) in the UI as actual files and not red
4181 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4178 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4182 # and therefore SYMROOT, needs to be set at the project level. 4179 # and therefore SYMROOT, needs to be set at the project level.
4183 'SYMROOT': '<(DEPTH)/xcodebuild', 4180 'SYMROOT': '<(DEPTH)/xcodebuild',
4184 }, 4181 },
4185 } 4182 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698