generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 21d9e58d: Merge "Rename the stack protector intermediate library."

Browse Source 
* commit '21d9e58d01080c7494c639ed3bd9e6c805e022d8':
  Rename the stack protector intermediate library.
This commit is contained in:
Elliott Hughes 2014-03-13 01:54:40 +00:00 committed by Android Git Automerger
commit e3ff496aac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/Android.mk
View File

@ -455,7 +455,7 @@ endef
# ======================================================== # ========================================================
# libbionic_ssp.a - stack protector code # libc_stack_protector.a - stack protector code
# ======================================================== # ========================================================
# #
# The stack protector code needs to be compiled # The stack protector code needs to be compiled
@ -469,7 +469,7 @@ LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror
LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libbionic_ssp LOCAL_MODULE := libc_stack_protector
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
@ -664,12 +664,12 @@ LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_common LOCAL_MODULE := libc_common
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := \
libbionic_ssp \
libc_bionic \ libc_bionic \
libc_dns \ libc_dns \
libc_freebsd \ libc_freebsd \
libc_netbsd \ libc_netbsd \
libc_openbsd \ libc_openbsd \
libc_stack_protector \
libc_syscalls \ libc_syscalls \
libc_tzcode \ libc_tzcode \