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

Side by Side Diff: skia/skia_library_opts.gyp

Issue 199583008: Enable Arm64 target arch in gyp build config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove gold Created 6 years, 9 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
« build/common.gypi ('K') | « components/nacl/nacl_defines.gypi ('k') | 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 # This gyp file contains the platform-specific optimizations for Skia 6 # This gyp file contains the platform-specific optimizations for Skia
7 { 7 {
8 'targets': [ 8 'targets': [
9 # Due to an unfortunate intersection of lameness between gcc and gyp, 9 # Due to an unfortunate intersection of lameness between gcc and gyp,
10 # we have to build the *_SSE2.cpp files in a separate target. The 10 # we have to build the *_SSE2.cpp files in a separate target. The
(...skipping 20 matching lines...) Expand all
31 'skia_common.gypi', 31 'skia_common.gypi',
32 ], 32 ],
33 'include_dirs': [ 33 'include_dirs': [
34 '../third_party/skia/include/core', 34 '../third_party/skia/include/core',
35 '../third_party/skia/include/effects', 35 '../third_party/skia/include/effects',
36 '../third_party/skia/src/core', 36 '../third_party/skia/src/core',
37 '../third_party/skia/src/opts', 37 '../third_party/skia/src/opts',
38 ], 38 ],
39 'conditions': [ 39 'conditions': [
40 [ 'os_posix == 1 and OS != "mac" and OS != "android" and \ 40 [ 'os_posix == 1 and OS != "mac" and OS != "android" and \
41 target_arch != "arm" and target_arch != "mipsel"', { 41 target_arch != "arm" and target_arch != "arm64" and \
42 target_arch != "mipsel"', {
42 'cflags': [ 43 'cflags': [
43 '-msse2', 44 '-msse2',
44 ], 45 ],
45 }], 46 }],
46 [ 'target_arch != "arm" and target_arch != "mipsel"', { 47 [ 'target_arch != "arm" and target_arch != "mipsel" and \
48 target_arch != "arm64"', {
47 'sources': [ 49 'sources': [
48 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', 50 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
49 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', 51 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
50 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', 52 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
51 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', 53 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
52 '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', 54 '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
53 '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', 55 '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
54 '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp', 56 '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
55 '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp', 57 '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
56 ], 58 ],
57 'dependencies': [ 59 'dependencies': [
58 'skia_opts_ssse3', 60 'skia_opts_ssse3',
59 ], 61 ],
60 }], 62 }],
61 [ 'target_arch == "arm"', { 63 [ 'target_arch == "arm"', {
Nico 2014/03/20 15:00:20 Likely want arm64 here too eventually.
rmcilroy 2014/03/20 15:14:54 Yes, some bits for sure. I added a todo for now.
62 'conditions': [ 64 'conditions': [
63 [ 'arm_version >= 7 and arm_neon == 1', { 65 [ 'arm_version >= 7 and arm_neon == 1', {
64 'defines': [ 66 'defines': [
65 '__ARM_HAVE_NEON', 67 '__ARM_HAVE_NEON',
66 ], 68 ],
67 }], 69 }],
68 [ 'arm_version >= 7 and arm_neon_optional == 1', { 70 [ 'arm_version >= 7 and arm_neon_optional == 1', {
69 'defines': [ 71 'defines': [
70 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', 72 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
71 ], 73 ],
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 'defines': [ 264 'defines': [
263 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', 265 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
264 ], 266 ],
265 }], 267 }],
266 ], 268 ],
267 }, 269 },
268 ], 270 ],
269 }], 271 }],
270 ], 272 ],
271 } 273 }
OLDNEW
« build/common.gypi ('K') | « components/nacl/nacl_defines.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698