commit ec674b4d064d923818d0deba9f8378d13ff6451a
author Elliott Hughes <enh@google.com> Mon Mar 10 23:25:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 10 23:25:39 2014 +0000
tree d41780db5bb98c42ecb02267ed18d07ce6876307
parent 21d9e58d01080c7494c639ed3bd9e6c805e022d8
parent 57a883640f3b43bf5e332d64489b3eab67a5ac3f

Merge "Switch to upstream FreeBSD ldexp.c."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index a41b1d4..d27d204 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -455,7 +455,7 @@
 
 
 # ========================================================
-# libbionic_ssp.a - stack protector code
+# libc_stack_protector.a - stack protector code
 # ========================================================
 #
 # The stack protector code needs to be compiled
@@ -469,7 +469,7 @@
 LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
 LOCAL_CPPFLAGS := $(libc_common_cppflags)
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
-LOCAL_MODULE := libbionic_ssp
+LOCAL_MODULE := libc_stack_protector
 LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
@@ -664,12 +664,12 @@
 LOCAL_MODULE := libc_common
 LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
 LOCAL_WHOLE_STATIC_LIBRARIES := \
-    libbionic_ssp \
     libc_bionic \
     libc_dns \
     libc_freebsd \
     libc_netbsd \
     libc_openbsd \
+    libc_stack_protector \
     libc_syscalls \
     libc_tzcode \