diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-03 17:50:01 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-03 17:50:01 +0000 |
| commit | b6779439c48a8f918679c18a62010bdd815e194f (patch) | |
| tree | 9a450c56e8f04eb3cf183f0eb56ca308f1bd8e27 /include/core/SkPreConfig.h | |
| parent | 681faa3388570a9447453d00c65930de5f02c6e0 (diff) | |
Fix ios build in chromium when targeting multiple architectures
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/222583003
git-svn-id: http://skia.googlecode.com/svn/trunk@14048 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPreConfig.h')
| -rw-r--r-- | include/core/SkPreConfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 8be03bf60c..41670317d3 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -149,7 +149,7 @@ ////////////////////////////////////////////////////////////////////// // ARM defines -#if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) +#if defined(__arm__) && !defined(__APPLE__) #define SK_CPU_ARM #if defined(__GNUC__) @@ -180,7 +180,7 @@ #endif #endif -#if defined(__aarch64__) +#if defined(__aarch64__) && !defined(__APPLE__) #define SK_CPU_ARM64 #endif |