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

Side by Side Diff: gyp/opts.gyp

Issue 1094843005: Revert of Allow NEON on iOS. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: 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 | « 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 2015 Google Inc. 1 # Copyright 2015 Google Inc.
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 # Gyp file for building opts target. 5 # Gyp file for building opts target.
6 { 6 {
7 # Source lists live in opts.gypi. This makes it easier to maintain our Chrome GYP/GN setup. 7 # Source lists live in opts.gypi. This makes it easier to maintain our Chrome GYP/GN setup.
8 # (To be honest, I'm not sure why we need to include common.gypi. I thought i t was automatic.) 8 # (To be honest, I'm not sure why we need to include common.gypi. I thought i t was automatic.)
9 'variables': { 9 'variables': {
10 'includes': [ 'common.gypi', 'opts.gypi' ], 10 'includes': [ 'common.gypi', 'opts.gypi' ],
(...skipping 30 matching lines...) Expand all
41 'conditions': [ 41 'conditions': [
42 [ '(mips_arch_variant == "mips32r2") and (mips_dsp == 1 or mips_dsp == 2)', { 42 [ '(mips_arch_variant == "mips32r2") and (mips_dsp == 1 or mips_dsp == 2)', {
43 'sources': [ '<@(mips_dsp_sources)' ], 43 'sources': [ '<@(mips_dsp_sources)' ],
44 },{ 44 },{
45 'sources': [ '<@(none_sources)' ], 45 'sources': [ '<@(none_sources)' ],
46 }], 46 }],
47 ] 47 ]
48 }], 48 }],
49 49
50 [ '(skia_arch_type == "arm" and arm_version < 7) \ 50 [ '(skia_arch_type == "arm" and arm_version < 7) \
51 or (skia_os == "ios") \
51 or (skia_os == "android" \ 52 or (skia_os == "android" \
52 and skia_arch_type not in ["x86", "x86_64", "arm", "mips", "arm6 4"])', { 53 and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \
54 "arm64"])', {
53 'sources': [ '<@(none_sources)' ], 55 'sources': [ '<@(none_sources)' ],
54 }], 56 }],
55 57
56 [ 'skia_arch_type == "arm" and arm_version >= 7', { 58 [ 'skia_arch_type == "arm" and arm_version >= 7', {
57 # The assembly uses the frame pointer register (r7 in Thumb/r11 in 59 # The assembly uses the frame pointer register (r7 in Thumb/r11 in
58 # ARM), the compiler doesn't like that. 60 # ARM), the compiler doesn't like that.
59 'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ], 61 'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ],
60 'cflags': [ '-fomit-frame-pointer' ], 62 'cflags': [ '-fomit-frame-pointer' ],
61 'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' }, 63 'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' },
62 'sources': [ '<@(armv7_sources)' ], 64 'sources': [ '<@(armv7_sources)' ],
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 ], 147 ],
146 }], 148 }],
147 ], 149 ],
148 'ldflags': [ 150 'ldflags': [
149 '-march=armv7-a', 151 '-march=armv7-a',
150 '-Wl,--fix-cortex-a8', 152 '-Wl,--fix-cortex-a8',
151 ], 153 ],
152 }, 154 },
153 ], 155 ],
154 } 156 }
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