Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: include/core/SkPreConfig.h

Issue 222583003: Fix ios build in chromium when targeting multiple architectures (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: remove simulator condition Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPreConfig.h
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 8be03bf60c6cea44624900aaa2239d6c1d17275f..41670317d328bd67310871da36234b96015463f8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698