summaryrefslogtreecommitdiffstats
path: root/libcutils/Android.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-06-20 10:28:28 -0700
committerChristopher Ferris <cferris@google.com>2014-06-23 19:28:33 -0700
commitd660d895c1401fa96d65a397d0667664bca60b58 (patch)
tree5bc3b7908a9e76ac98676325639aeb12e7182eeb /libcutils/Android.mk
parent7950fc47a76cf7fe2d5c5e1a25002cb7848cf155 (diff)
downloadsystem_core-d660d895c1401fa96d65a397d0667664bca60b58.zip
system_core-d660d895c1401fa96d65a397d0667664bca60b58.tar.gz
system_core-d660d895c1401fa96d65a397d0667664bca60b58.tar.bz2
Add android_memset16/android_memset32 for aarch64.
Included new unit tests for these functions. Bug: 15456369 Change-Id: I3fac02f61c62d15d54d0df51957680d7155e98ae
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r--libcutils/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index c0faed4..933a77b 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -134,6 +134,9 @@ LOCAL_SRC_FILES := $(commonSources) \
LOCAL_SRC_FILES_arm += \
arch-arm/memset32.S \
+LOCAL_SRC_FILES_arm64 += \
+ arch-arm64/android_memset.S \
+
LOCAL_SRC_FILES_mips += \
arch-mips/android_memset.c \
@@ -146,6 +149,7 @@ LOCAL_SRC_FILES_x86_64 += \
arch-x86_64/android_memset32_SSE2-atom.S \
LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32
+LOCAL_CFLAGS_arm64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32