am 6a6f1850: am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip"
* commit '6a6f18506900c67f822cbc7523c04ea6e0a45e72':
Package breakpad symbols in target files zip
diff --git a/core/Makefile b/core/Makefile
index 94c9f10..de90b28 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1591,6 +1591,10 @@
$(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 $@) .)
@# Run fs_config on all the system, vendor, boot ramdisk,
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 240415d..5b11724 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -91,7 +91,7 @@
###########################################################
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 33c1510..5cc275e 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -389,6 +389,8 @@
$(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