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

Merge "Don't verify version scripts on 32-bit Brillo"

Browse Source
This commit is contained in:
Dan Willemsen 2015-12-12 02:29:29 +00:00 committed by Gerrit Code Review
commit a7ff3964ab
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libc/Android.mk
View File

@ -1424,6 +1424,14 @@ LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map LOCAL_LDFLAGS_x86 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
# Brillo doesn't use the same libc 32-bit ABI as Android (no ndk cruft)
ifdef BRILLO
# TODO: b/26164862 provide alternate version scripts instead of disabling verification.
LOCAL_LDFLAGS_arm += -Wl,--undefined-version
LOCAL_LDFLAGS_mips += -Wl,--undefined-version
LOCAL_LDFLAGS_x86 += -Wl,--undefined-version
endif
# 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
# compatibility. # compatibility.