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

Side by Side Diff: gyp/common_variables.gypi

Issue 804063002: WAE on Macs too. That leaves only Android framework builds. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: mac a different way Created 6 years 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
« 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 2012 The Android Open Source Project 1 # Copyright 2012 The Android Open Source Project
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 # Get ready for the ugly... 7 # Get ready for the ugly...
8 # 8 #
9 # - We have to nest our variables dictionaries multiple levels deep, so that 9 # - We have to nest our variables dictionaries multiple levels deep, so that
10 # this and other gyp files can rely on previously-set variable values in 10 # this and other gyp files can rely on previously-set variable values in
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'skia_opencl%': 0, 154 'skia_opencl%': 0,
155 'skia_force_distance_field_text%': 0, 155 'skia_force_distance_field_text%': 0,
156 156
157 # These variables determine the default optimization level for different 157 # These variables determine the default optimization level for different
158 # compilers. 158 # compilers.
159 'skia_default_vs_optimization_level': 3, # full (/Ox) 159 'skia_default_vs_optimization_level': 3, # full (/Ox)
160 'skia_default_gcc_optimization_level': 3, # -O3 160 'skia_default_gcc_optimization_level': 3, # -O3
161 }, 161 },
162 162
163 'conditions': [ 163 'conditions': [
164 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "win"] ' 164 [ 'skia_os in ["mac", "linux", "freebsd", "openbsd", "solaris", "android", "win"] '
165 'and skia_android_framework == 0 or ' 165 'and skia_android_framework == 0', {
166 'skia_os == "mac" and skia_arch_width == 32', {
167 'skia_warnings_as_errors%': 1, 166 'skia_warnings_as_errors%': 1,
168 }, { 167 }, {
169 'skia_warnings_as_errors%': 0, 168 'skia_warnings_as_errors%': 0,
170 }], 169 }],
171 170
172 # This variable allows the user to customize the optimization level used 171 # This variable allows the user to customize the optimization level used
173 # by the compiler. The user should be aware that this has different 172 # by the compiler. The user should be aware that this has different
174 # meanings for different compilers and should exercise caution when 173 # meanings for different compilers and should exercise caution when
175 # overriding it. 174 # overriding it.
176 [ 'skia_os == "win"', { 175 [ 'skia_os == "win"', {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 'skia_moz2d%': 0, 238 'skia_moz2d%': 0,
240 'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEAD LESS\', 0)")', 239 'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEAD LESS\', 0)")',
241 'skia_egl%': '<(skia_egl)', 240 'skia_egl%': '<(skia_egl)',
242 241
243 # These are referenced by our .gypi files that list files (e.g. core.gypi) 242 # These are referenced by our .gypi files that list files (e.g. core.gypi)
244 # 243 #
245 'skia_src_path%': '../src', 244 'skia_src_path%': '../src',
246 'skia_include_path%': '../include', 245 'skia_include_path%': '../include',
247 }, 246 },
248 } 247 }
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