commit bb1207f99c392d0abc3739475a14e3075215ceca
author Shinichiro Hamaji <hamaji@google.com> Thu Jan 07 05:17:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 07 05:17:27 2016 +0000
tree a5f802cfec1e1375d7c2ba4c89a87edf465668e2
parent 5774bafd181933ca8b5687286fe8734e4f82eda9
parent c610c42b99c0f9570492731911199ae75d1ad9c0

Merge "Have symbol versions in .so.toc files"
am: c610c42b99

* commit 'c610c42b99c0f9570492731911199ae75d1ad9c0':
  Have symbol versions in .so.toc files

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 2dc3983..37c781d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -230,7 +230,7 @@
 # Commands to generate .toc file common to ELF .so files.
 define _gen_toc_command_for_elf
 $(hide) ($($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)READELF) -d $(1) | grep SONAME || echo "No SONAME for $1") > $(2)
-$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -gD -f p $(1) | cut -f1-2 -d" " >> $(2)
+$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)READELF) --dyn-syms $(1) | awk '{$$2=""; $$3=""; print}' >> $(2)
 endef
 
 # Commands to generate .toc file from Darwin dynamic library.