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

diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 8be03bf..4167031 100644 (file)
--- 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