diff options
| author |  agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-11-19 03:21:57 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-11-19 03:21:57 +0000 |
| commit | 28bee9591d1b24de4a536dbd2ae948df8186ba94 (patch) | |
| tree | e73ef5a1f670774a4249e35238c4c43ad09adf23 | |
| parent | 181172d5642fce4a4c1d339a6e3c5e4a8079b11a (diff) | |
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
| -rw-r--r-- | src/core/SkBitmapProcState_filter.h | 3 | ||||
| -rw-r--r-- | src/opts/SkBitmapProcState_opts_arm.cpp | 5 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 5 |
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" |