diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-10 15:50:45 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-12-10 15:54:20 -0800 |
| commit | 7ccf48e10e83c159e2149744d5261cbeddf7c0e4 (patch) | |
| tree | a9a242b2a3e71f219258498d3b5bbca9da1b66d9 | |
| parent | 4381cd6760b5b0b772322b2257bc2ced5d05da5d (diff) | |
| download | art-7ccf48e10e83c159e2149744d5261cbeddf7c0e4.tar.gz art-7ccf48e10e83c159e2149744d5261cbeddf7c0e4.tar.bz2 art-7ccf48e10e83c159e2149744d5261cbeddf7c0e4.zip | |
Don't use the version script for executables.
The version script was forcing all the ASAN symbols to be hidden,
which caused any ASAN instrumented shared libraries used by these
executables (such as libc++) to be unable to find these symbols.
Bug: 18671691
Change-Id: I7839a10041d5f75ce43b59920675b2eff0837606
| -rw-r--r-- | build/Android.executable.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index ae42136e9e..4b3dfb3683 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -66,9 +66,9 @@ define build-art-executable endif LOCAL_CFLAGS := $(ART_EXECUTABLES_CFLAGS) - # Mac OS linker doesn't understand --export-dynamic/--version-script. + # Mac OS linker doesn't understand --export-dynamic. ifneq ($$(HOST_OS)-$$(art_target_or_host),darwin-host) - LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic + LOCAL_LDFLAGS := -Wl,--export-dynamic endif ifeq ($$(art_target_or_host),target) |