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

Side by Side Diff: gyp/common_variables.gypi

Issue 24644003: Add skia_tsan_build to match skia_asan_build and fix one example race. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 2 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 | « gyp/common_conditions.gypi ('k') | tests/skia_test.cpp » ('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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 'arm_version%': 7, 72 'arm_version%': 7,
73 'arm_neon%': 0, # neon asm files known not to work with the ios build 73 'arm_neon%': 0, # neon asm files known not to work with the ios build
74 },{ # skia_os is not ios 74 },{ # skia_os is not ios
75 'skia_arch_type%': 'x86', 75 'skia_arch_type%': 'x86',
76 'arm_version%': 0, 76 'arm_version%': 0,
77 'arm_neon%': 0, 77 'arm_neon%': 0,
78 }], 78 }],
79 ], 79 ],
80 80
81 'skia_asan_build%': 0, 81 'skia_asan_build%': 0,
82 'skia_tsan_build%': 0,
82 'skia_scalar%': 'float', 83 'skia_scalar%': 'float',
83 'skia_mesa%': 0, 84 'skia_mesa%': 0,
84 'skia_nv_path_rendering%': 0, 85 'skia_nv_path_rendering%': 0,
85 'skia_stroke_path_rendering%': 0, 86 'skia_stroke_path_rendering%': 0,
86 'skia_android_path_rendering%': 0, 87 'skia_android_path_rendering%': 0,
87 'skia_texture_cache_mb_limit%': 0, 88 'skia_texture_cache_mb_limit%': 0,
88 'skia_angle%': 0, 89 'skia_angle%': 0,
89 'skia_directwrite%': 0, 90 'skia_directwrite%': 0,
90 'skia_gpu%': 1, 91 'skia_gpu%': 1,
91 'skia_osx_sdkroot%': '', 92 'skia_osx_sdkroot%': '',
(...skipping 19 matching lines...) Expand all
111 112
112 # This variable allows the user to customize the optimization level used 113 # This variable allows the user to customize the optimization level used
113 # by the compiler. The user should be aware that this has different 114 # by the compiler. The user should be aware that this has different
114 # meanings for different compilers and should exercise caution when 115 # meanings for different compilers and should exercise caution when
115 # overriding it. 116 # overriding it.
116 [ 'skia_os == "win"', { 117 [ 'skia_os == "win"', {
117 'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve l)', 118 'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve l)',
118 }, { 119 }, {
119 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', 120 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)',
120 }], 121 }],
121 [ 'skia_asan_build', { 122 [ 'skia_asan_build or skia_tsan_build', {
122 'skia_clang_build': 1, 123 'skia_clang_build': 1,
123 }, { 124 }, {
124 'skia_clang_build%': 0, 125 'skia_clang_build%': 0,
125 }], 126 }],
126 ], 127 ],
127 128
128 # Re-define all variables defined within the level-2 'variables' dict, 129 # Re-define all variables defined within the level-2 'variables' dict,
129 # so that siblings of the level-1 'variables' dict can see them. 130 # so that siblings of the level-1 'variables' dict can see them.
130 'arm_version%': '<(arm_version)', 131 'arm_version%': '<(arm_version)',
131 'arm_neon%': '<(arm_neon)', 132 'arm_neon%': '<(arm_neon)',
132 'arm_neon_optional%': 0, 133 'arm_neon_optional%': 0,
133 'skia_os%': '<(skia_os)', 134 'skia_os%': '<(skia_os)',
134 'os_posix%': '<(os_posix)', 135 'os_posix%': '<(os_posix)',
135 'skia_asan_build%': '<(skia_asan_build)', 136 'skia_asan_build%': '<(skia_asan_build)',
137 'skia_tsan_build%': '<(skia_tsan_build)',
136 'skia_scalar%': '<(skia_scalar)', 138 'skia_scalar%': '<(skia_scalar)',
137 'skia_mesa%': '<(skia_mesa)', 139 'skia_mesa%': '<(skia_mesa)',
138 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 140 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)',
139 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)', 141 'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
140 'skia_android_path_rendering%': '<(skia_android_path_rendering)', 142 'skia_android_path_rendering%': '<(skia_android_path_rendering)',
141 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)', 143 'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)',
142 'skia_angle%': '<(skia_angle)', 144 'skia_angle%': '<(skia_angle)',
143 'skia_arch_width%': '<(skia_arch_width)', 145 'skia_arch_width%': '<(skia_arch_width)',
144 'skia_arch_type%': '<(skia_arch_type)', 146 'skia_arch_type%': '<(skia_arch_type)',
145 'skia_directwrite%': '<(skia_directwrite)', 147 'skia_directwrite%': '<(skia_directwrite)',
(...skipping 11 matching lines...) Expand all
157 # 159 #
158 'skia_src_path%': '../src', 160 'skia_src_path%': '../src',
159 'skia_include_path%': '../include', 161 'skia_include_path%': '../include',
160 }, 162 },
161 } 163 }
162 # Local Variables: 164 # Local Variables:
163 # tab-width:2 165 # tab-width:2
164 # indent-tabs-mode:nil 166 # indent-tabs-mode:nil
165 # End: 167 # End:
166 # vim: set expandtab tabstop=2 shiftwidth=2: 168 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | tests/skia_test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698