Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8adb6cb authored by Steve Fung's avatar Steve Fung Committed by Android Git Automerger
Browse files

am 6a6f1850: am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip" 

* commit '6a6f1850':
  Package breakpad symbols in target files zip
parents 103c2839 6a6f1850

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -1590,6 +1590,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 $@) .)

core/dynamic_binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/envsetup.mk

+2 −0
Original line number Diff line number Diff line
@@ -389,6 +389,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