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

Side by Side Diff: gyp/common_variables.gypi

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 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 | « gyp/common_conditions.gypi ('k') | gyp/debugger.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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 'skia_static_initializers%': 0, 95 'skia_static_initializers%': 0,
96 'skia_egl%': 1, 96 'skia_egl%': 1,
97 }, { 97 }, {
98 'skia_static_initializers%': 1, 98 'skia_static_initializers%': 1,
99 }], 99 }],
100 [ 'skia_os == "ios"', { 100 [ 'skia_os == "ios"', {
101 'skia_arch_type%': 'arm', 101 'skia_arch_type%': 'arm',
102 'arm_version%': 7, 102 'arm_version%': 7,
103 'arm_neon%': 0, # neon asm files known not to work with the ios build 103 'arm_neon%': 0, # neon asm files known not to work with the ios build
104 }], 104 }],
105 [ 'skia_os == "nacl"', { 105 [ 'skia_os == "android" and not skia_android_framework',
106 'skia_egl%': 1,
107 }],
108 [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
109 # skia_freetype_static - on OS variants that normally would 106 # skia_freetype_static - on OS variants that normally would
110 # dynamically link the system FreeType library, don't do 107 # dynamically link the system FreeType library, don't do
111 # that; instead statically link to the version in 108 # that; instead statically link to the version in
112 # third_party/freetype and third_party/externals/freetype. 109 # third_party/freetype and third_party/externals/freetype.
113 { 110 {
114 'skia_freetype_static%': '1', 111 'skia_freetype_static%': '1',
115 }, { 112 }, {
116 'skia_freetype_static%': '0', 113 'skia_freetype_static%': '0',
117 } 114 }
118 ], 115 ],
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 '-ffast-math', # Optimize float math even when it breaks IEEE compliance. 238 '-ffast-math', # Optimize float math even when it breaks IEEE compliance.
242 #'-flto' # Enable link-time optimization. 239 #'-flto' # Enable link-time optimization.
243 ], 240 ],
244 241
245 # These are referenced by our .gypi files that list files (e.g. core.gypi) 242 # These are referenced by our .gypi files that list files (e.g. core.gypi)
246 # 243 #
247 'skia_src_path%': '../src', 244 'skia_src_path%': '../src',
248 'skia_include_path%': '../include', 245 'skia_include_path%': '../include',
249 }, 246 },
250 } 247 }
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | gyp/debugger.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698