commit 4aa51cd46842d4e821bd5536fd80ee0a796f3a83
author Pavel Chupin <pavel.v.chupin@intel.com> Thu Oct 10 20:19:15 2013 +0400
committer Pavel Chupin <pavel.v.chupin@intel.com> Thu Oct 10 20:20:16 2013 +0400
tree b342d83653de9e0de3dc4f7467b54df656bbdd7b
parent 2de8102d422f48eec44fe8782cd2411f04f1dcb2

Cleanup x86 flags and memset versions

ARCH_X86_HAVE_SSE2 is always true

Change-Id: I680493d14280aafad5448aec727e8d9a84a6db00
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 57fc021..7117103 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -128,12 +128,8 @@
     LOCAL_SRC_FILES += arch-arm/memset32.S
 else  # !arm
     ifeq ($(TARGET_ARCH),x86)
-        ifeq ($(ARCH_X86_HAVE_SSE2),true)
-            LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -DUSE_SSE2
-            LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
-        else # !ARCH_X86_HAVE_SSE2
-            LOCAL_SRC_FILES += memory.c
-        endif # !ARCH_X86_HAVE_SSE2
+        LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
+        LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
     else # !x86
         ifeq ($(TARGET_ARCH),mips)
             LOCAL_SRC_FILES += arch-mips/android_memset.c