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

Side by Side Diff: gyp/common_variables.gypi

Issue 1244843003: skia: ANGLE deps roll (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: merge Created 5 years, 5 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 | « DEPS ('k') | src/gpu/gl/angle/SkANGLEGLContext.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 18 matching lines...) Expand all
29 # 'variable' dict during gyp processing) 29 # 'variable' dict during gyp processing)
30 # and NOT inherited by "uncles" (siblings of directly enclosing 'variable' 30 # and NOT inherited by "uncles" (siblings of directly enclosing 'variable'
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 'variables': { # level 2 40 'variables': { # level 2
40 41
41 # Variables needed by conditions list within the level-2 variables dict. 42 # Variables needed by conditions list within the level-2 variables dict.
42 'variables': { # level 3 43 'variables': { # level 3
43 'variables': { # level 4 44 'variables': { # level 4
44 # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow 45 # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
45 # for cross-compilation (e.g. building for either MacOS or iOS on Mac) . 46 # for cross-compilation (e.g. building for either MacOS or iOS on Mac) .
46 # We set it automatically based on 'OS' (the host OS), but allow the 47 # We set it automatically based on 'OS' (the host OS), but allow the
47 # user to override it via GYP_DEFINES if they like. 48 # user to override it via GYP_DEFINES if they like.
48 'skia_os%': '<(OS)', 49 'skia_os%': '<(OS)',
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 231 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
231 #'-flto' # Enable link-time optimization. 232 #'-flto' # Enable link-time optimization.
232 ], 233 ],
233 234
234 # These are referenced by our .gypi files that list files (e.g. core.gypi) 235 # These are referenced by our .gypi files that list files (e.g. core.gypi)
235 # 236 #
236 'skia_src_path%': '../src', 237 'skia_src_path%': '../src',
237 'skia_include_path%': '../include', 238 'skia_include_path%': '../include',
238 }, 239 },
239 } 240 }
OLDNEW
« no previous file with comments | « DEPS ('k') | src/gpu/gl/angle/SkANGLEGLContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698