commit 91bb1b61f8d0cea4f527d308bdfce16b3c7c7a87
author Shinichiro Hamaji <hamaji@google.com> Thu Jan 07 05:23:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 07 05:23:34 2016 +0000
tree 92510b967208fbd6f5f1a293da677797e0f7781b
parent 3d49222496a00065e27ca0e6b93da8173527855d
parent bb1207f99c392d0abc3739475a14e3075215ceca

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

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

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 1a65894..26c354d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -236,7 +236,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.