am 48fa28ba: Merge "Add version to libc.so symbols"

* commit '48fa28bacd7e84651d381e2428944916e45b5508':
  Add version to libc.so symbols
This commit is contained in:
Dmitriy Ivanov 2015-06-16 18:27:09 +00:00 committed by Android Git Automerger
commit 2e1f6107fe
2 changed files with 1457 additions and 2 deletions

View File

@ -1341,7 +1341,7 @@ LOCAL_CLANG := $(use_clang)
LOCAL_REQUIRED_MODULES := tzdata LOCAL_REQUIRED_MODULES := tzdata
LOCAL_ADDITIONAL_DEPENDENCIES := \ LOCAL_ADDITIONAL_DEPENDENCIES := \
$(libc_common_additional_dependencies) \ $(libc_common_additional_dependencies) \
$(LOCAL_PATH)/version_script.txt \ $(LOCAL_PATH)/libc.map \
# Leave the symbols in the shared library so that stack unwinders can produce # Leave the symbols in the shared library so that stack unwinders can produce
# meaningful name resolution. # meaningful name resolution.
@ -1369,7 +1369,7 @@ LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_SYSTEM_SHARED_LIBRARIES :=
# Don't re-export new/delete and friends, even if the compiler really wants to. # Don't re-export new/delete and friends, even if the compiler really wants to.
LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/libc.map
# We'd really like to do this for all architectures, but since this wasn't done # We'd really like to do this for all architectures, but since this wasn't done
# before, these symbols must continue to be exported on LP32 for binary # before, these symbols must continue to be exported on LP32 for binary

1455
libc/libc.map Normal file

File diff suppressed because it is too large Load Diff