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

Commit 7a087661 authored by Jihoon Kang's avatar Jihoon Kang Committed by Android (Google) Code Review
Browse files

Merge "Migrate the symbols copying rule from make to Soong" into main

parents d6dc25ad 12d983ff

core/soong_app_prebuilt.mk

+0 −8
Original line number Diff line number Diff line
@@ -143,14 +143,6 @@ endif 
my_jni_lib_symbols_copy_files := $(foreach f,$(LOCAL_SOONG_JNI_LIBS_SYMBOLS),\

  $(call word-colon,1,$(f)):$(patsubst $(PRODUCT_OUT)/%,$(TARGET_OUT_UNSTRIPPED)/%,$(call word-colon,2,$(f))))



$(foreach f, $(my_jni_lib_symbols_copy_files), \

  $(eval $(call copy-unstripped-elf-file-with-mapping, \

    $(call word-colon,1,$(f)), \

    $(call word-colon,2,$(f)), \

    $(patsubst $(TARGET_OUT_UNSTRIPPED)/%,$(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)/%,$(call word-colon,2,$(f)).textproto)\

  ))\

)



symbolic_outputs := $(foreach f,$(my_jni_lib_symbols_copy_files),$(call word-colon,2,$(f)))

symbolic_mappings := $(foreach f,$(symbolic_outputs),$(patsubst $(TARGET_OUT_UNSTRIPPED)/%,$(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)/%,$(f).textproto))

ALL_MODULES.$(my_register_name).SYMBOLIC_OUTPUT_PATH := $(symbolic_outputs)

core/soong_cc_rust_prebuilt.mk

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ ifndef LOCAL_IS_HOST_MODULE 
      ALL_MODULES.$(my_register_name).SYMBOLIC_OUTPUT_PATH := $(symbolic_output)

      ALL_MODULES.$(my_register_name).ELF_SYMBOL_MAPPING_PATH := $(elf_symbol_mapping_path)



      $(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)