diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-03 23:39:46 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-03 23:39:46 +0000 |
| commit | d01ec71f9c350ab73e24808a5d4da22a3c8fc515 (patch) | |
| tree | 76299c180794db2dc7597bcb74fcc2ea86d11a1b /include/core/SkPreConfig.h | |
| parent | 9e613c096c854033a727f52c0f6b8ecde56e99ab (diff) | |
Revert to old behavior regarding SK_CPU_ARM and update documentation around SK_CPU_ARM64 on iOS.
R=robertphillips@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/216823008
git-svn-id: http://skia.googlecode.com/svn/trunk@14057 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPreConfig.h')
| -rw-r--r-- | include/core/SkPreConfig.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 41670317d3..5c653f5207 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -149,7 +149,7 @@ ////////////////////////////////////////////////////////////////////// // ARM defines -#if defined(__arm__) && !defined(__APPLE__) +#if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) #define SK_CPU_ARM #if defined(__GNUC__) @@ -180,7 +180,8 @@ #endif #endif -#if defined(__aarch64__) && !defined(__APPLE__) +// Disable ARM64 optimizations for iOS due to complications regarding gyp and iOS. +#if defined(__aarch64__) && !defined(SK_BUILD_FOR_IOS) #define SK_CPU_ARM64 #endif |