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

Side by Side Diff: gyp/common_variables.gypi

Issue 1653543002: Revert of Treat bad values passed to --images as a fatal error (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « gyp/common_conditions.gypi ('k') | tools/flags/SkCommonFlags.h » ('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 20 matching lines...) Expand all
31 # dicts), so we have to re-define every variable at every enclosure level 31 # dicts), so we have to re-define every variable at every enclosure level
32 # within our ridiculous matryoshka doll of 'variable' dicts. That's why 32 # within our ridiculous matryoshka doll of 'variable' dicts. That's why
33 # we have variable definitions like this: 'skia_os%': '<(skia_os)', 33 # we have variable definitions like this: 'skia_os%': '<(skia_os)',
34 # 34 #
35 # See http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi?revisi on=127004 , 35 # See http://src.chromium.org/viewvc/chrome/trunk/src/build/common.gypi?revisi on=127004 ,
36 # which deals with these same constraints in a similar manner. 36 # which deals with these same constraints in a similar manner.
37 # 37 #
38 'variables': { # level 1 38 'variables': { # level 1
39 'angle_path%': '../', 39 'angle_path%': '../',
40 40
41 # RAW codec needs exceptions. Due to that, it is a separate target. Its usag e can be controlled
42 # by this variable.
43 'skia_codec_decodes_raw%': 1,
44
41 'variables': { # level 2 45 'variables': { # level 2
42 46
43 # Variables needed by conditions list within the level-2 variables dict. 47 # Variables needed by conditions list within the level-2 variables dict.
44 'variables': { # level 3 48 'variables': { # level 3
45 'variables': { # level 4 49 'variables': { # level 4
46 # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow 50 # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
47 # for cross-compilation (e.g. building for either MacOS or iOS on Mac) . 51 # for cross-compilation (e.g. building for either MacOS or iOS on Mac) .
48 # We set it automatically based on 'OS' (the host OS), but allow the 52 # We set it automatically based on 'OS' (the host OS), but allow the
49 # user to override it via GYP_DEFINES if they like. 53 # user to override it via GYP_DEFINES if they like.
50 'skia_os%': '<(OS)', 54 'skia_os%': '<(OS)',
51 }, 55 },
52 'skia_os%': '<(skia_os)', 56 'skia_os%': '<(skia_os)',
53 57
54 'skia_android_framework%': 0, 58 'skia_android_framework%': 0,
55 'conditions' : [ 59 'conditions' : [
56 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { 60 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
57 'skia_arch_type%': 'x86_64', 61 'skia_arch_type%': 'x86_64',
58 }, { 62 }, {
59 'skia_arch_type%': 'x86', 63 'skia_arch_type%': 'x86',
60 }], 64 }],
61 # RAW codec needs exceptions. Due to that, it is a separate target. It s usage can be
62 # controlled by skia_codec_decodes_raw.
63 ['skia_os == "chromeos"', {
64 # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gett ime()].
65 'skia_codec_decodes_raw%' : 0,
66 }, {
67 'skia_codec_decodes_raw%' : 1,
68 }],
69 ], 65 ],
70 'arm_version%': 0, 66 'arm_version%': 0,
71 'arm_neon%': 0, 67 'arm_neon%': 0,
72 'skia_egl%': 0, 68 'skia_egl%': 0,
73 }, 69 },
74 70
75 # Re-define all variables defined within the level-3 'variables' dict, 71 # Re-define all variables defined within the level-3 'variables' dict,
76 # so that siblings of the level-2 'variables' dict can see them. 72 # so that siblings of the level-2 'variables' dict can see them.
77 # (skia_os will depend on skia_android_framework.) 73 # (skia_os will depend on skia_android_framework.)
78 'skia_android_framework%': '<(skia_android_framework)', 74 'skia_android_framework%': '<(skia_android_framework)',
79 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
80 'skia_arch_type%': '<(skia_arch_type)', 75 'skia_arch_type%': '<(skia_arch_type)',
81 'arm_version%': '<(arm_version)', 76 'arm_version%': '<(arm_version)',
82 'arm_neon%': '<(arm_neon)', 77 'arm_neon%': '<(arm_neon)',
83 'skia_egl%': '<(skia_egl)', 78 'skia_egl%': '<(skia_egl)',
84 79
85 'conditions': [ 80 'conditions': [
86 [ 'skia_android_framework == 1', { 81 [ 'skia_android_framework == 1', {
87 'skia_os%': 'android', 82 'skia_os%': 'android',
88 'skia_chrome_utils%': 0, 83 'skia_chrome_utils%': 0,
89 'skia_use_android_framework_defines%': 1, 84 'skia_use_android_framework_defines%': 1,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 'skia_no_fontconfig%': '<(skia_no_fontconfig)', 207 'skia_no_fontconfig%': '<(skia_no_fontconfig)',
213 'skia_embedded_fonts%': '<(skia_embedded_fonts)', 208 'skia_embedded_fonts%': '<(skia_embedded_fonts)',
214 'skia_sanitizer%': '<(skia_sanitizer)', 209 'skia_sanitizer%': '<(skia_sanitizer)',
215 'skia_sanitizer_blacklist%': 210 'skia_sanitizer_blacklist%':
216 '<!(python -c "import sys; import os; print os.path.abspath(sys.argv[1])" ../tools/xsan.blacklist)', 211 '<!(python -c "import sys; import os; print os.path.abspath(sys.argv[1])" ../tools/xsan.blacklist)',
217 'skia_mesa%': '<(skia_mesa)', 212 'skia_mesa%': '<(skia_mesa)',
218 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 213 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)',
219 'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)', 214 'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)',
220 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 215 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
221 'skia_android_framework%': '<(skia_android_framework)', 216 'skia_android_framework%': '<(skia_android_framework)',
222 'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
223 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines )', 217 'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines )',
224 'skia_use_system_json%': '<(skia_use_system_json)', 218 'skia_use_system_json%': '<(skia_use_system_json)',
225 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 219 'skia_android_path_rendering%': '<(skia_android_path_rendering)',
226 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)', 220 'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
227 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)', 221 'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
228 'skia_angle%': '<(skia_angle)', 222 'skia_angle%': '<(skia_angle)',
229 'skia_arch_type%': '<(skia_arch_type)', 223 'skia_arch_type%': '<(skia_arch_type)',
230 'skia_chrome_utils%': '<(skia_chrome_utils)', 224 'skia_chrome_utils%': '<(skia_chrome_utils)',
231 'skia_command_buffer%': '<(skia_command_buffer)', 225 'skia_command_buffer%': '<(skia_command_buffer)',
232 'skia_gdi%': '<(skia_gdi)', 226 'skia_gdi%': '<(skia_gdi)',
(...skipping 25 matching lines...) Expand all
258 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 252 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
259 #'-flto' # Enable link-time optimization. 253 #'-flto' # Enable link-time optimization.
260 ], 254 ],
261 255
262 # These are referenced by our .gypi files that list files (e.g. core.gypi) 256 # These are referenced by our .gypi files that list files (e.g. core.gypi)
263 # 257 #
264 'skia_src_path%': '../src', 258 'skia_src_path%': '../src',
265 'skia_include_path%': '../include', 259 'skia_include_path%': '../include',
266 }, 260 },
267 } 261 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | tools/flags/SkCommonFlags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698