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

Commit 7ecdf750 authored by Jihoon Kang's avatar Jihoon Kang Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-3542808-FGVHVOTNBS" into main 

* changes:
  Revert "Modify the params of copy-unstripped-elf-file-with-mapping"
  Revert "Generate symbols mapping files for jni libs"
  Revert "Create symbols.zip per test suite"
  Revert "Remove redundant entries from symbols.zip"
  Revert "Replace test suites symbols.zip name patterns"
parents de6c2706 9566a5e1

core/Makefile

+14 −28
Original line number Diff line number Diff line
@@ -7186,12 +7186,6 @@ dexpreopt_config_zip: $(DEXPREOPT_CONFIG_ZIP) 


$(call declare-1p-target,$(DEXPREOPT_CONFIG_ZIP),)



# -----------------------------------------------------------------

# Zips of the symbols directory per test suites

#



$(foreach suite,$(ALL_COMPATIBILITY_SUITES),$(eval $(call create-suite-symbols-map,$(suite))))



# -----------------------------------------------------------------

# A zip of the symbols directory.  Keep the full paths to make it

# more obvious where these files came from.
@@ -7210,37 +7204,29 @@ SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name)-symbols.zip 
# The path to a file containing mappings from elf IDs to filenames.

SYMBOLS_MAPPING := $(PRODUCT_OUT)/$(name)-symbols-mapping.textproto

.KATI_READONLY := SYMBOLS_ZIP SYMBOLS_MAPPING



# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

  _symbols_zip_modules := $(call product-installed-modules,$(INTERNAL_PRODUCT))

  $(SYMBOLS_ZIP): $(updater_dep)

else

  _symbols_zip_modules := $(unbundled_build_modules)

$(SYMBOLS_ZIP): $(INTERNAL_ALLIMAGES_FILES) $(updater_dep)

endif



_symbols_zip_modules_symbols_files := $(foreach m,$(_symbols_zip_modules),$(ALL_MODULES.$(m).SYMBOLIC_OUTPUT_PATH))

_symbols_zip_modules_mapping_files := $(foreach m,$(_symbols_zip_modules),$(ALL_MODULES.$(m).ELF_SYMBOL_MAPPING_PATH))



$(SYMBOLS_ZIP): PRIVATE_SYMBOLS_MODULES_FILES := $(_symbols_zip_modules_symbols_files)

$(SYMBOLS_ZIP): PRIVATE_SYMBOLS_MODULES_MAPPING_FILES := $(_symbols_zip_modules_mapping_files)

$(SYMBOLS_ZIP): $(SOONG_ZIP) $(SYMBOLS_MAP) $(_symbols_zip_modules_symbols_files) $(_symbols_zip_modules_mapping_files)

$(SYMBOLS_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,symbols)/filelist

$(SYMBOLS_ZIP): PRIVATE_MAPPING_PACKAGING_DIR := $(call intermediates-dir-for,PACKAGING,elf_symbol_mapping)

$(SYMBOLS_ZIP): $(SOONG_ZIP) $(SYMBOLS_MAP)

	@echo "Package symbols: $@"

	$(hide) rm -rf $@ $@.symbols_list $@.mapping_list

	# Find all installed files in the symbols directory and zip them into the symbols zip.

	echo "$(PRIVATE_SYMBOLS_MODULES_FILES)" | tr " " "\n" | sort > $@.symbols_list

	$(hide) $(SOONG_ZIP) -d -o $@ -l $@.symbols_list

	# Find all installed files in the symbols mapping directory and merge them into the symbols mapping textproto.

	echo "$(PRIVATE_SYMBOLS_MODULES_MAPPING_FILES)" | tr " " "\n" | sort > $@.mapping_list

	$(hide) $(SYMBOLS_MAP) -merge $(SYMBOLS_MAPPING) @$@.mapping_list

	$(hide) rm -rf $@ $(PRIVATE_LIST_FILE)

	$(hide) mkdir -p $(TARGET_OUT_UNSTRIPPED) $(dir $(PRIVATE_LIST_FILE)) $(PRIVATE_MAPPING_PACKAGING_DIR)

	# Find all of the files in the symbols directory and zip them into the symbols zip.

	$(hide) find -L $(TARGET_OUT_UNSTRIPPED) -type f | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SOONG_ZIP) --ignore_missing_files -d -o $@ -C $(OUT_DIR)/.. -l $(PRIVATE_LIST_FILE)

	# Find all of the files in the symbols mapping directory and merge them into the symbols mapping textproto.

	$(hide) find -L $(PRIVATE_MAPPING_PACKAGING_DIR) -type f | sort >$(PRIVATE_LIST_FILE)

	$(hide) $(SYMBOLS_MAP) -merge $(SYMBOLS_MAPPING) -ignore_missing_files @$(PRIVATE_LIST_FILE)

$(SYMBOLS_ZIP): .KATI_IMPLICIT_OUTPUTS := $(SYMBOLS_MAPPING)



$(call declare-1p-container,$(SYMBOLS_ZIP),)

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(call declare-container-license-deps,$(SYMBOLS_ZIP),$(PRIVATE_SYMBOLS_MODULES_FILES) $(updater_dep),$(PRODUCT_OUT)/:/)

$(call declare-container-license-deps,$(SYMBOLS_ZIP),$(INTERNAL_ALLIMAGES_FILES) $(updater_dep),$(PRODUCT_OUT)/:/)

endif



_symbols_zip_modules_symbols_files :=

_symbols_zip_modules_mapping_files :=

# -----------------------------------------------------------------

# A zip of the coverage directory.

#

core/definitions.mk

+2 −28
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,$(3))

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

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

endef



# Copy an R8 dictionary to the packaging directory while also extracting
@@ -3689,32 +3689,6 @@ $(eval $(my_all_targets) : \ 
    $(sort $(foreach suite,$(LOCAL_COMPATIBILITY_SUITE),$(my_compat_dist_config_$(suite))))))

endef



# Define symbols.zip and symbols-mapping.textproto build rule per test suite

#

# $(1): Name of the test suite to create the zip and mapping build rules

define create-suite-symbols-map

_suite_symbols_zip := $$(subst -tests-,-tests_-,$$(PRODUCT_OUT)/$(1)-symbols.zip)

_suite_symbols_mapping := $$(subst -tests-,-tests_-,$$(PRODUCT_OUT)/$(1)-symbols-mapping.textproto)

_suite_modules_symbols_files := $$(foreach m,$$(COMPATIBILITY.$(1).MODULES),$$(ALL_MODULES.$$(m).SYMBOLIC_OUTPUT_PATH))

_suite_modules_mapping_files := $$(foreach m,$$(COMPATIBILITY.$(1).MODULES),$$(ALL_MODULES.$$(m).ELF_SYMBOL_MAPPING_PATH))



$$(_suite_symbols_zip): PRIVATE_SUITE_SYMBOLS_MAPPING := $$(_suite_symbols_mapping)

$$(_suite_symbols_zip): PRIVATE_SUITE_MODULES_SYMBOLS_FILES := $$(_suite_modules_symbols_files)

$$(_suite_symbols_zip): PRIVATE_SUITE_MODULES_MAPPING_FILES := $$(_suite_modules_mapping_files)

$$(_suite_symbols_zip): $$(SOONG_ZIP) $$(SYMBOLS_MAP) $$(_suite_modules_symbols_files) $$(_suite_modules_mapping_files)

	@echo "Package $(1) symbols: $$@"

	$(hide) rm -rf $$@ $$@.symbols_list $$@.mapping_list

	echo "$$(PRIVATE_SUITE_MODULES_SYMBOLS_FILES)" | tr " " "\n" | sort > $$@.symbols_list

	$(hide) $$(SOONG_ZIP) -d -o $$@ -l $$@.symbols_list

	echo "$$(PRIVATE_SUITE_MODULES_MAPPING_FILES)" | tr " " "\n" | sort > $$@.mapping_list

	$(hide) $$(SYMBOLS_MAP) -merge $$(PRIVATE_SUITE_SYMBOLS_MAPPING) @$$@.mapping_list

$$(_suite_symbols_zip): .KATI_IMPLICIT_OUTPUTS := $$(_suite_symbols_mapping)



.PHONY: $(1)

$(1): $$(_suite_symbols_zip) $$(_suite_symbols_mapping)

$$(call dist-for-goals-with-filenametag,$(1), $$(_suite_symbols_zip) $$(_suite_symbols_mapping))

endef



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

## Path Cleaning

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

core/dynamic_binary.mk

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

symbolic_input := $(inject_module)

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

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



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

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



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

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



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

## Store breakpad symbols

core/soong_app_prebuilt.mk

+1 −15
Original line number Diff line number Diff line
@@ -142,21 +142,7 @@ endif 
# install symbol files of JNI libraries

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)

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



$(LOCAL_BUILT_MODULE): | $(symbolic_outputs)

$(LOCAL_BUILT_MODULE): | $(call copy-many-files, $(my_jni_lib_symbols_copy_files))



# embedded JNI will already have been handled by soong

my_embed_jni :=

core/soong_cc_rust_prebuilt.mk

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

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



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

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

      $(LOCAL_BUILT_MODULE): | $(symbolic_output)



      ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)