From dfbab49bed1d65f1aedfada99718c46e2614fb35 Mon Sep 17 00:00:00 2001 From: Steve Fung Date: Thu, 24 Sep 2015 18:12:33 -0700 Subject: [PATCH] Package breakpad symbols in target files zip When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad symbols into the target files zip thats generated with `make dist`. Bug: 24165970 Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada --- core/Makefile | 4 ++++ core/dynamic_binary.mk | 2 +- core/envsetup.mk | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 0f200f9a1..6676bee67 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1562,6 +1562,10 @@ endif ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root) +endif +ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) + # If breakpad symbols have been generated, add them to the zip. + $(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 240415d76..5b1172465 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -91,7 +91,7 @@ $(symbolic_output) : $(symbolic_input) | $(ACP) ########################################################### ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) -my_breakpad_path := $(PRODUCT_OUT)/breakpad/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path)) +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) diff --git a/core/envsetup.mk b/core/envsetup.mk index 51a2fb3bd..2899d80a3 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -384,6 +384,8 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_EXECUTABLES := $(TARGET_OUT_ODM_EXEC $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_SHARED_LIBRARIES := $(TARGET_OUT_ODM)/lib $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS := $(TARGET_OUT_ODM_APPS) +TARGET_OUT_BREAKPAD := $(PRODUCT_OUT)/breakpad + TARGET_OUT_UNSTRIPPED := $(PRODUCT_OUT)/symbols TARGET_OUT_EXECUTABLES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/bin TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)/system/lib