From 7a2f984ad53eb52a0c865781ef85390a591f80e4 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Thu, 20 Mar 2014 18:35:49 +0000 Subject: Enable Arm64 target arch in gyp build config Initial support to get us started. There is a lot more work to do before we can compile for arm64. BUG=354405 Review URL: https://codereview.chromium.org/199583008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258363 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/skia.gyp | 6 ++++-- skia/skia_library_opts.gyp | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'skia') diff --git a/skia/skia.gyp b/skia/skia.gyp index 4a5d62e..4c4f6f8 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -99,12 +99,14 @@ ], 'conditions': [ [ 'os_posix == 1 and OS != "mac" and OS != "android" and \ - target_arch != "arm" and target_arch != "mipsel"', { + target_arch != "arm" and target_arch != "mipsel" and \ + target_arch != "arm64"', { 'cflags': [ '-msse2', ], }], - [ 'target_arch != "arm" and target_arch != "mipsel"', { + [ 'target_arch != "arm" and target_arch != "mipsel" and \ + target_arch != "arm64"', { 'sources': [ 'ext/convolver_SSE2.cc', ], diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 3e2a4f8..f463c76 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -38,12 +38,14 @@ ], 'conditions': [ [ 'os_posix == 1 and OS != "mac" and OS != "android" and \ - target_arch != "arm" and target_arch != "mipsel"', { + target_arch != "arm" and target_arch != "arm64" and \ + target_arch != "mipsel"', { 'cflags': [ '-msse2', ], }], - [ 'target_arch != "arm" and target_arch != "mipsel"', { + [ 'target_arch != "arm" and target_arch != "mipsel" and \ + target_arch != "arm64"', { 'sources': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', @@ -58,6 +60,7 @@ 'skia_opts_ssse3', ], }], + # TODO(rmcilroy): Add neon support for arm64 - http://crbug.com/354405 [ 'target_arch == "arm"', { 'conditions': [ [ 'arm_version >= 7 and arm_neon == 1', { @@ -177,7 +180,8 @@ ], }, }], - [ 'target_arch != "arm" and target_arch != "mipsel"', { + [ 'target_arch != "arm" and target_arch != "arm64" and \ + target_arch != "mipsel"', { 'sources': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp', ], -- cgit v1.1