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

Side by Side Diff: gyp/common_variables.gypi

Issue 433513004: Update NEON compiler defines to use SK_ prefix (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 4 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 | « no previous file | include/core/SkPreConfig.h » ('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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 'skia_arch_width%': 32, 86 'skia_arch_width%': 32,
87 }], 87 }],
88 [ 'skia_os == "android"', { 88 [ 'skia_os == "android"', {
89 'skia_static_initializers%': 0, 89 'skia_static_initializers%': 0,
90 }, { 90 }, {
91 'skia_static_initializers%': 1, 91 'skia_static_initializers%': 1,
92 }], 92 }],
93 [ 'skia_os == "ios"', { 93 [ 'skia_os == "ios"', {
94 'skia_arch_type%': 'arm', 94 'skia_arch_type%': 'arm',
95 'arm_version%': 7, 95 'arm_version%': 7,
96 'arm_neon%': 0, # neon asm files known not to work with the ios build 96 'arm_neon_optional%': 1,
97 }], 97 }],
98 [ 'skia_os in ["android", "nacl"] and not skia_android_framework', 98 [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
99 # skia_freetype_static - on OS variants that normally would 99 # skia_freetype_static - on OS variants that normally would
100 # dynamically link the system FreeType library, don't do 100 # dynamically link the system FreeType library, don't do
101 # that; instead statically link to the version in 101 # that; instead statically link to the version in
102 # third_party/freetype and third_party/externals/freetype. 102 # third_party/freetype and third_party/externals/freetype.
103 { 103 {
104 'skia_freetype_static%': '1', 104 'skia_freetype_static%': '1',
105 }, { 105 }, {
106 'skia_freetype_static%': '0', 106 'skia_freetype_static%': '0',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 'skia_moz2d%': 0, 234 'skia_moz2d%': 0,
235 'skia_crash_handler%': 235 'skia_crash_handler%':
236 '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)") ', 236 '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)") ',
237 237
238 # These are referenced by our .gypi files that list files (e.g. core.gypi) 238 # These are referenced by our .gypi files that list files (e.g. core.gypi)
239 # 239 #
240 'skia_src_path%': '../src', 240 'skia_src_path%': '../src',
241 'skia_include_path%': '../include', 241 'skia_include_path%': '../include',
242 }, 242 },
243 } 243 }
OLDNEW
« no previous file with comments | « no previous file | include/core/SkPreConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698