Merge "Add support for ECDSA P-256 with SHA256"
diff --git a/debuggerd/tombstone.c b/debuggerd/tombstone.c
index 1a6066e..24debf4 100644
--- a/debuggerd/tombstone.c
+++ b/debuggerd/tombstone.c
@@ -621,7 +621,6 @@
if (!backtrace_read_word(backtrace, address, &data)) {
break;
}
- data = 0;
address += sizeof(uint32_t);
if ((*p++ = (data >> 0) & 0xff) == 0) {
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 57fc021..6207f1f 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -106,11 +106,6 @@
# Shared and static library for target
# ========================================================
-# This is needed in LOCAL_C_INCLUDES to access the C library's private
-# header named <bionic_time.h>
-#
-libcutils_c_includes := bionic/libc/private
-
include $(CLEAR_VARS)
LOCAL_MODULE := libcutils
LOCAL_SRC_FILES := $(commonSources) \
@@ -128,12 +123,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
diff --git a/libcutils/arch-x86/android_memset16.S b/libcutils/arch-x86/android_memset16.S
index b1f09cb..f8b79bd 100644
--- a/libcutils/arch-x86/android_memset16.S
+++ b/libcutils/arch-x86/android_memset16.S
@@ -17,16 +17,9 @@
* Contributed by: Intel Corporation
*/
-#if defined(USE_SSE2)
-
# include "cache_wrapper.S"
# undef __i686
# define USE_AS_ANDROID
# define sse2_memset16_atom android_memset16
# include "sse2-memset16-atom.S"
-#else
-
-# include "memset16.S"
-
-#endif
diff --git a/libcutils/arch-x86/android_memset32.S b/libcutils/arch-x86/android_memset32.S
index 1fb2ffe..6249fce 100644
--- a/libcutils/arch-x86/android_memset32.S
+++ b/libcutils/arch-x86/android_memset32.S
@@ -17,17 +17,9 @@
* Contributed by: Intel Corporation
*/
-#if defined(USE_SSE2)
-
# include "cache_wrapper.S"
# undef __i686
# define USE_AS_ANDROID
# define sse2_memset32_atom android_memset32
# include "sse2-memset32-atom.S"
-#else
-
-# include "memset32.S"
-
-#endif
-