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

Side by Side Diff: gyp/common_variables.gypi

Issue 1343193005: skia: Add support for ANGLE on linux (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: remove newline Created 5 years, 3 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
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 }, { 164 }, {
165 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)', 165 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev el)',
166 }], 166 }],
167 [ 'skia_sanitizer', { 167 [ 'skia_sanitizer', {
168 'skia_clang_build': 1, 168 'skia_clang_build': 1,
169 'skia_keep_frame_pointer': 1, 169 'skia_keep_frame_pointer': 1,
170 }, { 170 }, {
171 'skia_clang_build%': 0, 171 'skia_clang_build%': 0,
172 'skia_keep_frame_pointer%': 0, 172 'skia_keep_frame_pointer%': 0,
173 }], 173 }],
174 [ 'skia_shared_lib or skia_sanitizer or skia_os == "android"', { 174 [ 'skia_shared_lib or skia_sanitizer or skia_os == "android" or (skia_os = = "linux" and skia_angle == 1)', {
175 'skia_pic%' : 1, 175 'skia_pic%' : 1,
176 }, { 176 }, {
177 'skia_pic%' : 0, 177 'skia_pic%' : 0,
178 } 178 }
179 ], 179 ],
180 ], 180 ],
181 181
182 # Re-define all variables defined within the level-2 'variables' dict, 182 # Re-define all variables defined within the level-2 'variables' dict,
183 # so that siblings of the level-1 'variables' dict can see them. 183 # so that siblings of the level-1 'variables' dict can see them.
184 'arm_version%': '<(arm_version)', 184 'arm_version%': '<(arm_version)',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 235 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
236 #'-flto' # Enable link-time optimization. 236 #'-flto' # Enable link-time optimization.
237 ], 237 ],
238 238
239 # 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)
240 # 240 #
241 'skia_src_path%': '../src', 241 'skia_src_path%': '../src',
242 'skia_include_path%': '../include', 242 'skia_include_path%': '../include',
243 }, 243 },
244 } 244 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698