Add ARM optimizations to the build.
Also had to fix a problem in the ARM memset code that was
causing some tests and bench to fail.
Review URL: http://codereview.appspot.com/5522052
git-svn-id: http://skia.googlecode.com/svn/trunk@2989 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index ae36481..1f67e00 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -28,6 +28,7 @@
'../include/config',
'../include/core',
'../src/core',
+ '../src/opts',
],
'conditions': [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
@@ -37,6 +38,7 @@
}],
[ 'skia_target_arch != "arm"', {
'sources': [
+ '../src/opts/opts_check_SSE2.cpp',
'../src/opts/SkBitmapProcState_opts_SSE2.cpp',
'../src/opts/SkBlitRow_opts_SSE2.cpp',
'../src/opts/SkUtils_opts_SSE2.cpp',
@@ -52,9 +54,12 @@
'-fomit-frame-pointer',
],
'sources': [
+ '../src/opts/opts_check_arm.cpp',
+ '../src/opts/memset.arm.S',
+ '../src/opts/memset16_neon.S',
+ '../src/opts/memset32_neon.S',
'../src/opts/SkBitmapProcState_opts_arm.cpp',
'../src/opts/SkBlitRow_opts_arm.cpp',
- '../src/opts/SkUtils_opts_none.cpp',
],
}],
[ 'skia_target_arch == "arm" and armv7 != 1', {