diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-08 19:00:26 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-08 19:00:26 +0000 |
| commit | 56c69773aea56c6c6bd47bc7e7970dd081205184 (patch) | |
| tree | 8897eb8c11b991b04cb60cc9283d7c541d8217f0 /src/opts | |
| parent | 6245ab718dea4dfb6415e97de6e8667f4b13de38 (diff) | |
Update files to use SK_BUILD_FOR_ANDROID.
This CL also removes any unecessary references to
the ANDROID definition.
Review URL: http://codereview.appspot.com/5354049
git-svn-id: http://skia.googlecode.com/svn/trunk@2629 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkBitmapProcState_opts_arm.cpp | 4 | ||||
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp index 224f754069..20d62e1455 100644 --- a/src/opts/SkBitmapProcState_opts_arm.cpp +++ b/src/opts/SkBitmapProcState_opts_arm.cpp @@ -7,10 +7,6 @@ */ -#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 d6539634c9..f8827015e3 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -6,10 +6,6 @@ */ -#ifdef ANDROID - #include <machine/cpu-features.h> -#endif - #include "SkBlitRow.h" #include "SkBlitMask.h" #include "SkColorPriv.h" @@ -992,7 +988,7 @@ static void S32A_D565_Opaque_Dither_neon (uint16_t * SK_RESTRICT dst, /* calculate 'd', which will be 0..7 */ /* dbase[] is 0..7; alpha is 0..256; 16 bits suffice */ -#if ANDROID +#if SK_BUILD_FOR_ANDROID /* SkAlpha255To256() semantic a+1 vs a+a>>7 */ alpha8 = vaddw_u8(vmovl_u8(sa), vdup_n_u8(1)); #else |