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

Side by Side Diff: gyp/common_variables.gypi

Issue 138843002: Roll fontconfig to 2.11.0 and reenable poppler on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: support 64bit win too Created 6 years, 11 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') | gyp/fontconfig.gyp » ('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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 # Re-define all variables defined within the level-3 'variables' dict, 50 # Re-define all variables defined within the level-3 'variables' dict,
51 # so that siblings of the level-2 'variables' dict can see them. 51 # so that siblings of the level-2 'variables' dict can see them.
52 'skia_os%': '<(skia_os)', 52 'skia_os%': '<(skia_os)',
53 53
54 'conditions': [ 54 'conditions': [
55 [ 'skia_os == "win"', { 55 [ 'skia_os == "win"', {
56 'os_posix%': 0, 56 'os_posix%': 0,
57 }, { 57 }, {
58 'os_posix%': 1, 58 'os_posix%': 1,
59 }], 59 }],
60 [ 'skia_os in ["linux", "win"]', { 60 [ 'skia_os in ["linux", "win", "mac"]', {
61 'skia_poppler_enabled%': 1, 61 'skia_poppler_enabled%': 1,
62 }, { 62 }, {
63 'skia_poppler_enabled%': 0, 63 'skia_poppler_enabled%': 0,
64 }], 64 }],
65 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { 65 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
66 'skia_arch_width%': 64, 66 'skia_arch_width%': 64,
67 }, { 67 }, {
68 'skia_arch_width%': 32, 68 'skia_arch_width%': 32,
69 }], 69 }],
70 [ 'skia_os == "android"', { 70 [ 'skia_os == "android"', {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'ios_sdk_version%': '6.0', 167 'ios_sdk_version%': '6.0',
168 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)', 168 'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
169 'skia_run_pdfviewer_in_gm%': 0, 169 'skia_run_pdfviewer_in_gm%': 0,
170 170
171 # These are referenced by our .gypi files that list files (e.g. core.gypi) 171 # These are referenced by our .gypi files that list files (e.g. core.gypi)
172 # 172 #
173 'skia_src_path%': '../src', 173 'skia_src_path%': '../src',
174 'skia_include_path%': '../include', 174 'skia_include_path%': '../include',
175 }, 175 },
176 } 176 }
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/fontconfig.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698