Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 173 }, { | 173 }, { |
| 174 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', | 174 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', |
| 175 }], | 175 }], |
| 176 [ 'skia_sanitizer', { | 176 [ 'skia_sanitizer', { |
| 177 'skia_clang_build': 1, | 177 'skia_clang_build': 1, |
| 178 'skia_keep_frame_pointer': 1, | 178 'skia_keep_frame_pointer': 1, |
| 179 }, { | 179 }, { |
| 180 'skia_clang_build%': 0, | 180 'skia_clang_build%': 0, |
| 181 'skia_keep_frame_pointer%': 0, | 181 'skia_keep_frame_pointer%': 0, |
| 182 }], | 182 }], |
| 183 [ 'skia_shared_lib == 1 or skia_sanitizer == "thread" ' | |
|
scroggo
2014/07/18 19:31:02
Also pulled out into https://codereview.chromium.o
| |
| 184 'or skia_sanitizer == "undefined" or skia_os == "android"', { | |
| 185 'skia_pic%' : 1, | |
| 186 }, { | |
| 187 'skia_pic%' : 0, | |
| 188 } | |
| 189 ], | |
| 183 ], | 190 ], |
| 184 | 191 |
| 185 # Re-define all variables defined within the level-2 'variables' dict, | 192 # Re-define all variables defined within the level-2 'variables' dict, |
| 186 # so that siblings of the level-1 'variables' dict can see them. | 193 # so that siblings of the level-1 'variables' dict can see them. |
| 187 'arm_version%': '<(arm_version)', | 194 'arm_version%': '<(arm_version)', |
| 188 'arm_neon%': '<(arm_neon)', | 195 'arm_neon%': '<(arm_neon)', |
| 189 'arm_neon_optional%': 0, | 196 'arm_neon_optional%': 0, |
| 190 'mips_arch_variant%': 'mips32', | 197 'mips_arch_variant%': 'mips32', |
| 191 'mips_dsp%': 0, | 198 'mips_dsp%': 0, |
| 192 'skia_os%': '<(skia_os)', | 199 'skia_os%': '<(skia_os)', |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 228 'skia_moz2d%': 0, | 235 'skia_moz2d%': 0, |
| 229 'skia_crash_handler%': | 236 'skia_crash_handler%': |
| 230 '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)") ', | 237 '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)") ', |
| 231 | 238 |
| 232 # These are referenced by our .gypi files that list files (e.g. core.gypi) | 239 # These are referenced by our .gypi files that list files (e.g. core.gypi) |
| 233 # | 240 # |
| 234 'skia_src_path%': '../src', | 241 'skia_src_path%': '../src', |
| 235 'skia_include_path%': '../include', | 242 'skia_include_path%': '../include', |
| 236 }, | 243 }, |
| 237 } | 244 } |
| OLD | NEW |