diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-05 21:43:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-05 21:43:16 +0000 |
| commit | a613844e137d93c7c6dc8efb8f2ca314764f0aae (patch) | |
| tree | 8c572d543f66fd089c10e336a3f059805e617627 /libcutils | |
| parent | 4a96142c455af4bc78aca1d152995c36bc75a9e9 (diff) | |
| parent | e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd (diff) | |
| download | core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.tar.gz core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.tar.bz2 core-a613844e137d93c7c6dc8efb8f2ca314764f0aae.zip | |
am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index b016a4239..12a3bf94c 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -124,9 +124,17 @@ LOCAL_SRC_FILES_arm += \ LOCAL_SRC_FILES_arm64 += \ arch-arm64/android_memset.S \ +ifndef ARCH_MIPS_REV6 LOCAL_SRC_FILES_mips += \ arch-mips/android_memset.c \ +LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32 +endif + +# TODO: switch mips64 back to using arch-mips/android_memset.c +LOCAL_SRC_FILES_mips64 += \ +# arch-mips/android_memset.c \ + LOCAL_SRC_FILES_x86 += \ arch-x86/android_memset16.S \ arch-x86/android_memset32.S \ @@ -137,7 +145,7 @@ LOCAL_SRC_FILES_x86_64 += \ LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_arm64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32 +#LOCAL_CFLAGS_mips64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 |