Exclude Android-only cpu-features.h from non-Android builds.

This is needed when building Chromium for ARM.

Patch by Joel Stanley <joel@chromium.org>

git-svn-id: http://skia.googlecode.com/svn/trunk@435 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkBitmapProcState_filter.h b/src/core/SkBitmapProcState_filter.h
index bb9625a..95d6a26 100644 (file)
--- 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 707304c..dfb5586 100644 (file)
--- 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 ae77bca..cb72473 100644 (file)
--- 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"