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

Side by Side Diff: gyp/common_variables.gypi

Issue 1417703013: GYP: remove stale skia_scalar gyp variable (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-11-10 (Tuesday) 13:15:58 EST Created 5 years, 1 month 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 | make.py » ('j') | 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ], 118 ],
119 ], 119 ],
120 120
121 # skia_no_fontconfig - On POSIX systems that would normally use the 121 # skia_no_fontconfig - On POSIX systems that would normally use the
122 # SkFontHost_fontconfig interface; use the SkFontHost_linux 122 # SkFontHost_fontconfig interface; use the SkFontHost_linux
123 # version instead. 123 # version instead.
124 'skia_no_fontconfig%': '0', 124 'skia_no_fontconfig%': '0',
125 'skia_embedded_fonts%': '0', 125 'skia_embedded_fonts%': '0',
126 126
127 'skia_sanitizer%': '', 127 'skia_sanitizer%': '',
128 'skia_scalar%': 'float',
129 'skia_mesa%': 0, 128 'skia_mesa%': 0,
130 'skia_gpu_extra_dependency_path%': '', 129 'skia_gpu_extra_dependency_path%': '',
131 'skia_gpu_extra_tests_path%': '', 130 'skia_gpu_extra_tests_path%': '',
132 'skia_stroke_path_rendering%': 0, 131 'skia_stroke_path_rendering%': 0,
133 'skia_android_path_rendering%': 0, 132 'skia_android_path_rendering%': 0,
134 'skia_resource_cache_mb_limit%': 0, 133 'skia_resource_cache_mb_limit%': 0,
135 'skia_resource_cache_count_limit%': 0, 134 'skia_resource_cache_count_limit%': 0,
136 'skia_angle%': 0, 135 'skia_angle%': 0,
137 'skia_command_buffer%': 0, 136 'skia_command_buffer%': 0,
138 'skia_gdi%': 0, 137 'skia_gdi%': 0,
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 'arm_neon_optional%': 0, 196 'arm_neon_optional%': 0,
198 'mips_arch_variant%': 'mips32', 197 'mips_arch_variant%': 'mips32',
199 'mips_dsp%': 0, 198 'mips_dsp%': 0,
200 'skia_os%': '<(skia_os)', 199 'skia_os%': '<(skia_os)',
201 'os_posix%': '<(os_posix)', 200 'os_posix%': '<(os_posix)',
202 201
203 'skia_freetype_static%': '<(skia_freetype_static)', 202 'skia_freetype_static%': '<(skia_freetype_static)',
204 'skia_no_fontconfig%': '<(skia_no_fontconfig)', 203 'skia_no_fontconfig%': '<(skia_no_fontconfig)',
205 'skia_embedded_fonts%': '<(skia_embedded_fonts)', 204 'skia_embedded_fonts%': '<(skia_embedded_fonts)',
206 'skia_sanitizer%': '<(skia_sanitizer)', 205 'skia_sanitizer%': '<(skia_sanitizer)',
207 'skia_scalar%': '<(skia_scalar)',
208 'skia_mesa%': '<(skia_mesa)', 206 'skia_mesa%': '<(skia_mesa)',
209 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 207 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)',
210 'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)', 208 'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)',
211 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 209 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
212 'skia_android_framework%': '<(skia_android_framework)', 210 'skia_android_framework%': '<(skia_android_framework)',
213 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines )', 211 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines )',
214 'skia_use_system_json%': '<(skia_use_system_json)', 212 'skia_use_system_json%': '<(skia_use_system_json)',
215 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 213 'skia_android_path_rendering%': '<(skia_android_path_rendering)',
216 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)', 214 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
217 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)', 215 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
(...skipping 29 matching lines...) Expand all
247 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 245 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
248 #'-flto' # Enable link-time optimization. 246 #'-flto' # Enable link-time optimization.
249 ], 247 ],
250 248
251 # These are referenced by our .gypi files that list files (e.g. core.gypi) 249 # These are referenced by our .gypi files that list files (e.g. core.gypi)
252 # 250 #
253 'skia_src_path%': '../src', 251 'skia_src_path%': '../src',
254 'skia_include_path%': '../include', 252 'skia_include_path%': '../include',
255 }, 253 },
256 } 254 }
OLDNEW
« no previous file with comments | « no previous file | make.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698