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

Side by Side Diff: build/common.gypi

Issue 7219009: Add Skia on Chrome for Mac gyp rules (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 6 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 | printing/printing.gyp » ('j') | skia/skia.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 # Configuration policy is enabled by default. Set to 0 to disable. 139 # Configuration policy is enabled by default. Set to 0 to disable.
140 'configuration_policy%': 1, 140 'configuration_policy%': 1,
141 141
142 # If this is set, the clang plugins used on the buildbot will be used. 142 # If this is set, the clang plugins used on the buildbot will be used.
143 # Run tools/clang/scripts/update.sh to make sure they are compiled. 143 # Run tools/clang/scripts/update.sh to make sure they are compiled.
144 # This causes 'clang_chrome_plugins_flags' to be set. 144 # This causes 'clang_chrome_plugins_flags' to be set.
145 # Has no effect if 'clang' is not set as well. 145 # Has no effect if 'clang' is not set as well.
146 'clang_use_chrome_plugins%': 0, 146 'clang_use_chrome_plugins%': 0,
147 147
148 'conditions': [ 148 'conditions': [
149 # Use Skia as WebKit renderer on Mac
darin (slow to review) 2011/06/21 17:37:44 nit: indentation is off
150 ['OS=="mac"', {
151 'use_skia%': 0,
152 }, {
153 'use_skia%': 1,
154 }],
155
149 # A flag for POSIX platforms 156 # A flag for POSIX platforms
150 ['OS=="win"', { 157 ['OS=="win"', {
151 'os_posix%': 0, 158 'os_posix%': 0,
152 }, { 159 }, {
153 'os_posix%': 1, 160 'os_posix%': 1,
154 }], 161 }],
155 162
156 # Flags to use Gtk and X11 on non-Mac POSIX platforms 163 # Flags to use Gtk and X11 on non-Mac POSIX platforms
157 ['OS=="win" or OS=="mac"', { 164 ['OS=="win" or OS=="mac"', {
158 'toolkit_uses_gtk%': 0, 165 'toolkit_uses_gtk%': 0,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 # Copy conditionally-set variables out one scope. 220 # Copy conditionally-set variables out one scope.
214 'branding%': '<(branding)', 221 'branding%': '<(branding)',
215 'buildtype%': '<(buildtype)', 222 'buildtype%': '<(buildtype)',
216 'target_arch%': '<(target_arch)', 223 'target_arch%': '<(target_arch)',
217 'host_arch%': '<(host_arch)', 224 'host_arch%': '<(host_arch)',
218 'library%': 'static_library', 225 'library%': 'static_library',
219 'toolkit_views%': '<(toolkit_views)', 226 'toolkit_views%': '<(toolkit_views)',
220 'views_compositor%': '<(views_compositor)', 227 'views_compositor%': '<(views_compositor)',
221 'os_posix%': '<(os_posix)', 228 'os_posix%': '<(os_posix)',
222 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 229 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
230 'use_skia%': '<(use_skia)',
223 'use_x11%': '<(use_x11)', 231 'use_x11%': '<(use_x11)',
224 'use_gnome_keyring%': '<(use_gnome_keyring)', 232 'use_gnome_keyring%': '<(use_gnome_keyring)',
225 'linux_fpic%': '<(linux_fpic)', 233 'linux_fpic%': '<(linux_fpic)',
226 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 234 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
227 'chromeos%': '<(chromeos)', 235 'chromeos%': '<(chromeos)',
228 'touchui%': '<(touchui)', 236 'touchui%': '<(touchui)',
229 'file_manager_extension%': '<(file_manager_extension)', 237 'file_manager_extension%': '<(file_manager_extension)',
230 'inside_chromium_build%': '<(inside_chromium_build)', 238 'inside_chromium_build%': '<(inside_chromium_build)',
231 'fastbuild%': '<(fastbuild)', 239 'fastbuild%': '<(fastbuild)',
232 'python_ver%': '<(python_ver)', 240 'python_ver%': '<(python_ver)',
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 ['use_openssl==1', { 732 ['use_openssl==1', {
725 'defines': [ 733 'defines': [
726 'USE_OPENSSL=1', 734 'USE_OPENSSL=1',
727 ], 735 ],
728 }], 736 }],
729 ['enable_eglimage==1', { 737 ['enable_eglimage==1', {
730 'defines': [ 738 'defines': [
731 'ENABLE_EGLIMAGE=1', 739 'ENABLE_EGLIMAGE=1',
732 ], 740 ],
733 }], 741 }],
742 ['use_skia==1', {
743 'defines': [
744 'USE_SKIA=1',
745 ],
746 }],
734 ['coverage!=0', { 747 ['coverage!=0', {
735 'conditions': [ 748 'conditions': [
736 ['OS=="mac"', { 749 ['OS=="mac"', {
737 'xcode_settings': { 750 'xcode_settings': {
738 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs 751 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', # -fprofile-arcs
739 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage 752 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', # -ftest-coverage
740 }, 753 },
741 # Add -lgcov for types executable, shared_library, and 754 # Add -lgcov for types executable, shared_library, and
742 # loadable_module; not for static_library. 755 # loadable_module; not for static_library.
743 # This is a delayed conditional. 756 # This is a delayed conditional.
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1759 # and therefore SYMROOT, needs to be set at the project level. 1772 # and therefore SYMROOT, needs to be set at the project level.
1760 'SYMROOT': '<(DEPTH)/xcodebuild', 1773 'SYMROOT': '<(DEPTH)/xcodebuild',
1761 }, 1774 },
1762 } 1775 }
1763 1776
1764 # Local Variables: 1777 # Local Variables:
1765 # tab-width:2 1778 # tab-width:2
1766 # indent-tabs-mode:nil 1779 # indent-tabs-mode:nil
1767 # End: 1780 # End:
1768 # vim: set expandtab tabstop=2 shiftwidth=2: 1781 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | printing/printing.gyp » ('j') | skia/skia.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698