aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/core/SkBitmapProcState_filter.h3
-rw-r--r--src/opts/SkBitmapProcState_opts_arm.cpp5
-rw-r--r--src/opts/SkBlitRow_opts_arm.cpp5
3 files changed, 10 insertions, 3 deletions
diff --git a/src/core/SkBitmapProcState_filter.h b/src/core/SkBitmapProcState_filter.h
index bb9625a4ca..95d6a26b43 100644
--- a/src/core/SkBitmapProcState_filter.h
+++ b/src/core/SkBitmapProcState_filter.h
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#ifdef __arm__
+#ifdef ANDROID
#include <machine/cpu-features.h>
#endif
+
#include "SkColorPriv.h"
/*
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp
index 707304c964..dfb558625f 100644
--- a/src/opts/SkBitmapProcState_opts_arm.cpp
+++ b/src/opts/SkBitmapProcState_opts_arm.cpp
@@ -14,7 +14,10 @@
* limitations under the License.
*/
-#include <machine/cpu-features.h>
+#ifdef ANDROID
+ #include <machine/cpu-features.h>
+#endif
+
#include "SkBitmapProcState.h"
#include "SkColorPriv.h"
#include "SkUtils.h"
diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp
index ae77bca56e..cb72473a6c 100644
--- a/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/opts/SkBlitRow_opts_arm.cpp
@@ -15,7 +15,10 @@
** limitations under the License.
*/
-#include <machine/cpu-features.h>
+#ifdef ANDROID
+ #include <machine/cpu-features.h>
+#endif
+
#include "SkBlitRow.h"
#include "SkColorPriv.h"
#include "SkDither.h"