aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkUtils.cpp
diff options
context:
space:
mode:
authorGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-09 14:38:25 +0000
committerGravatar djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-09 14:38:25 +0000
commita44e6c6b5310be3b4724746b4fdca54c5233f41b (patch)
tree0bb1e4149a78f730abbb271be19112e8004a7eb7 /src/core/SkUtils.cpp
parente8c984d11ac2717b3d6c7ac132c6b47f67703f3d (diff)
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
Diffstat (limited to 'src/core/SkUtils.cpp')
-rw-r--r--src/core/SkUtils.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp
index 9161609de4..3f1c65e777 100644
--- a/src/core/SkUtils.cpp
+++ b/src/core/SkUtils.cpp
@@ -108,7 +108,6 @@ void sk_memset32_portable(uint32_t dst[], uint32_t value, int count) {
}
}
-#if !defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_ANDROID_NDK)
static void sk_memset16_stub(uint16_t dst[], uint16_t value, int count) {
SkMemset16Proc proc = SkMemset16GetPlatformProc();
sk_memset16 = proc ? proc : sk_memset16_portable;
@@ -125,8 +124,6 @@ static void sk_memset32_stub(uint32_t dst[], uint32_t value, int count) {
SkMemset32Proc sk_memset32 = sk_memset32_stub;
-#endif
-
///////////////////////////////////////////////////////////////////////////////
/* 0xxxxxxx 1 total