summaryrefslogtreecommitdiffstats
path: root/libcutils/Android.mk
diff options
context:
space:
mode:
authorBruce Beare <bruce.j.beare@intel.com>2010-12-27 16:53:58 -0800
committerBruce Beare <bruce.j.beare@intel.com>2011-01-02 17:00:09 -0800
commitd7a295221a96b02ebe50b65799da323770e67915 (patch)
tree34bcceaa8a10372adab79e90c6a822c8e28dfbcc /libcutils/Android.mk
parent378083a3f03db4eb623789c6f7a4bd827f44eb64 (diff)
downloadsystem_core-d7a295221a96b02ebe50b65799da323770e67915.zip
system_core-d7a295221a96b02ebe50b65799da323770e67915.tar.gz
system_core-d7a295221a96b02ebe50b65799da323770e67915.tar.bz2
Assembly coded android_memset16 and android_memset32
Change-Id: Ifa05006df7ce7364d18eb10d64a818d619664475 Author: Lu, Hongjiu <hongjiu.lu@intel.com> Signed-off-by: Mark Gross <mark.gross@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r--libcutils/Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index e8c7775..3dc3d69 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -112,12 +112,17 @@ LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c
ifeq ($(TARGET_ARCH),arm)
-LOCAL_SRC_FILES += memset32.S
+LOCAL_SRC_FILES += arch-arm/memset32.S
else # !arm
ifeq ($(TARGET_ARCH),sh)
LOCAL_SRC_FILES += memory.c atomic-android-sh.c
else # !sh
+ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
+LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
+LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
+else # !x86-atom
LOCAL_SRC_FILES += memory.c
+endif # !x86-atom
endif # !sh
endif # !arm