commit 93ee2b5869e4dfe9ce9c7ebc4b2d59645d991216
author Shinichiro Hamaji <hamaji@google.com> Thu Nov 05 04:11:52 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 05 04:11:52 2015 +0000
tree 40871b1cace1b0d38d883a2aa857e54fa3fa9312
parent 4f23722dd9b019b4d665f3dd65e0a9c48a4bfbc2
parent ad397422b4da3f5faff4e2ca69d4596b97e4bd61

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

* commit 'ad397422b4da3f5faff4e2ca69d4596b97e4bd61':
  Allow missing SONAME in .toc files

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 07c5f28..53f1fc0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -288,7 +288,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