commit 14f225b7625d9618c4be5bf31e6d40aad007ee94
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 31 23:37:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 31 23:37:41 2017 +0000
tree 6f7ff62406c1c0ac6f540ea383f90ce6cc8630a7
parent 35149ca0b786bb036399ab5f0a145d21c4c527ca
parent 445beae409aa5165b0b973b913b1f2197fac6753

Merge "Only generate breakpad symbols for ELF binaries"

core/dynamic_binary.mk

diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 949793b..f44b8a8 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -99,10 +99,15 @@
 my_breakpad_path := $(TARGET_OUT_BREAKPAD)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))
 breakpad_input := $(relocation_packer_output)
 breakpad_output := $(my_breakpad_path)/$(my_installed_module_stem).sym
-$(breakpad_output) : $(breakpad_input) | $(BREAKPAD_DUMP_SYMS)
+$(breakpad_output) : $(breakpad_input) | $(BREAKPAD_DUMP_SYMS) $(PRIVATE_READELF)
 	@echo "target breakpad: $(PRIVATE_MODULE) ($@)"
 	@mkdir -p $(dir $@)
-	$(hide) $(BREAKPAD_DUMP_SYMS) -c $< > $@
+	$(hide) if $(PRIVATE_READELF) -S $< > /dev/null 2>&1 ; then \
+	  $(BREAKPAD_DUMP_SYMS) -c $< > $@ ; \
+	else \
+	  echo "skipped for non-elf file."; \
+	  touch $@; \
+	fi
 $(LOCAL_BUILT_MODULE) : $(breakpad_output)
 endif