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

am: ad397422b4

* commit 'ad397422b4da3f5faff4e2ca69d4596b97e4bd61':
  Allow missing SONAME in .toc files
This commit is contained in:
Shinichiro Hamaji 2015-11-05 04:11:52 +00:00 committed by android-build-merger
commit 93ee2b5869
1 changed files with 1 additions and 1 deletions

View File

@ -288,7 +288,7 @@ TARGET_CPU_ABI2 := $(strip $(TARGET_CPU_ABI2))
# Commands to generate .toc file common to ELF .so files. # Commands to generate .toc file common to ELF .so files.
define _gen_toc_command_for_elf 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) $(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -gD -f p $(1) | cut -f1-2 -d" " >> $(2)
endef endef