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

Commit d8ee6f9d authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Modify the params of copy-unstripped-elf-file-with-mapping 

Similar to that of copy-r8-dictionary-file-with-mapping.

This allows setting the elf mappings paths as the values of the per
module variables.

Test: m nothing
Bug: 402471392
Change-Id: I80c5606417a21d97e33cf8931509935dda4ddf1f
parent f9e71768

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -3422,9 +3422,9 @@ endef 
# a hash mapping to the mapping directory.

# $(1): unstripped intermediates file

# $(2): path in symbols directory

# $(3): path in elf_symbol_mapping packaging directory

define copy-unstripped-elf-file-with-mapping

$(call _copy-symbols-file-with-mapping,$(1),$(2),\

  elf,$(patsubst $(TARGET_OUT_UNSTRIPPED)/%,$(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)/%,$(2).textproto))

$(call _copy-symbols-file-with-mapping,$(1),$(2),elf,$(3))

endef



# Copy an R8 dictionary to the packaging directory while also extracting

core/dynamic_binary.mk

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH) 
endif

symbolic_input := $(inject_module)

symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)

$(eval $(call copy-unstripped-elf-file-with-mapping,$(symbolic_input),$(symbolic_output)))

elf_mapping_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/%,$(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)/%,$(symbolic_output).textproto)

$(eval $(call copy-unstripped-elf-file-with-mapping,$(symbolic_input),$(symbolic_output),$(elf_mapping_path)))



###########################################################

## Store breakpad symbols

core/soong_cc_rust_prebuilt.mk

+3 −1
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ ifndef LOCAL_IS_HOST_MODULE 
      # drop /root as /root is mounted as /

      my_unstripped_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/root/%,$(TARGET_OUT_UNSTRIPPED)/%, $(my_unstripped_path))

      symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)

      $(eval $(call copy-unstripped-elf-file-with-mapping,$(LOCAL_SOONG_UNSTRIPPED_BINARY),$(symbolic_output)))

      elf_symbol_mapping_path := $(patsubst $(TARGET_OUT_UNSTRIPPED)/%,$(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)/%,$(symbolic_output).textproto)



      $(eval $(call copy-unstripped-elf-file-with-mapping,$(LOCAL_SOONG_UNSTRIPPED_BINARY),$(symbolic_output),$(elf_symbol_mapping_path)))

      $(LOCAL_BUILT_MODULE): | $(symbolic_output)



      ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)