commit 7070e5dc596376803802dd91aa9b446ee0571e5a
author Shinichiro Hamaji <hamaji@google.com> Thu Nov 05 04:07:21 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 05 04:07:21 2015 +0000
tree 593af07bb6253efbe354dfe09661e78ac1864ec4
parent 7557ad2bbdcf365f96a5df810cbfcc43f1766dfd
parent 457345e58c9f273a467847e2086318d6d8380d5b

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

* commit '457345e58c9f273a467847e2086318d6d8380d5b':
  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