commit ad397422b4da3f5faff4e2ca69d4596b97e4bd61
author Shinichiro Hamaji <hamaji@google.com> Thu Nov 05 04:09:59 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 05 04:09:59 2015 +0000
tree 593af07bb6253efbe354dfe09661e78ac1864ec4
parent 506c43c87193433533245150673f5d386aa10953
parent 7070e5dc596376803802dd91aa9b446ee0571e5a

Merge "Allow missing SONAME in .toc files" am: 457345e58c
am: 7070e5dc59

* commit '7070e5dc596376803802dd91aa9b446ee0571e5a':
  Allow missing SONAME in .toc files

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 9c275f7..49810ee 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -283,7 +283,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 > $(2)
+$(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)
 endef