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

Side by Side Diff: gyp/opts.gyp

Issue 1092753002: This section is moot: we divert ios to opts_none above. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: oops 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 | no next file » | 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 # 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
60 # ARM), the compiler doesn't like that. 60 # ARM), the compiler doesn't like that.
61 'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ], 61 'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ],
62 'cflags': [ '-fomit-frame-pointer' ], 62 'cflags': [ '-fomit-frame-pointer' ],
63 'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' }, 63 'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' },
64 'sources': [ '<@(armv7_sources)' ], 64 'sources': [ '<@(armv7_sources)' ],
65 'conditions': [ 65 'conditions': [
66 [ 'arm_neon == 1 or arm_neon_optional == 1', { 66 [ 'arm_neon == 1 or arm_neon_optional == 1', {
67 'dependencies': [ 'opts_neon' ] 67 'dependencies': [ 'opts_neon' ]
68 }], 68 }],
69 [ 'skia_os == "ios"', {
70 'sources!': [
71 # these fail to compile under xcode for ios
72 '../src/opts/SkBitmapProcState_opts_arm.cpp',
73 '../src/opts/SkBlitRow_opts_arm.cpp',
74 ],
75 }],
76 ], 69 ],
77 }], 70 }],
78 71
79 [ 'skia_arch_type == "arm64"', { 72 [ 'skia_arch_type == "arm64"', {
80 'sources': [ '<@(arm64_sources)' ], 73 'sources': [ '<@(arm64_sources)' ],
81 }], 74 }],
82 75
83 [ 'skia_android_framework', { 76 [ 'skia_android_framework', {
84 'cflags!': [ 77 'cflags!': [
85 '-msse2', 78 '-msse2',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 ], 147 ],
155 }], 148 }],
156 ], 149 ],
157 'ldflags': [ 150 'ldflags': [
158 '-march=armv7-a', 151 '-march=armv7-a',
159 '-Wl,--fix-cortex-a8', 152 '-Wl,--fix-cortex-a8',
160 ], 153 ],
161 }, 154 },
162 ], 155 ],
163 } 156 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698