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

Commit a85716ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused breakpad symbols related code in make" into main

parents 4cfebe84 411420c8

core/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -6724,10 +6724,6 @@ ifdef OSRELEASED_DIRECTORY 
	$(hide) cp $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version $(zip_root)/META/system_version.txt

endif

endif

ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) cp -R $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

ifdef BOARD_PREBUILT_VENDOR_BOOTIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDOR_BOOTIMAGE_TARGET) $(zip_root)/IMAGES/

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -685,12 +685,6 @@ BISON_DATA :=$= 
YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm



DOXYGEN:= doxygen

ifeq ($(HOST_OS),linux)

BREAKPAD_DUMP_SYMS := $(HOST_OUT_EXECUTABLES)/dump_syms

else

# For non-supported hosts, do not generate breakpad symbols.

BREAKPAD_GENERATE_SYMBOLS := false

endif

GZIP := prebuilts/build-tools/path/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/gzip

PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX)

NANOPB_SRCS := $(HOST_OUT_EXECUTABLES)/protoc-gen-nanopb

core/dynamic_binary.mk

+0 −21
Original line number Diff line number Diff line
@@ -62,26 +62,6 @@ 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)))



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

## Store breakpad symbols

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



ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

my_breakpad_path := $(TARGET_OUT_BREAKPAD)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))

breakpad_input := $(inject_module)

breakpad_output := $(my_breakpad_path)/$(my_installed_module_stem).sym

$(breakpad_output) : $(breakpad_input) | $(BREAKPAD_DUMP_SYMS) $(PRIVATE_READELF)

	@echo "target breakpad: $(PRIVATE_MODULE) ($@)"

	@mkdir -p $(dir $@)

	$(hide) if $(PRIVATE_READELF) -S $< > /dev/null 2>&1 ; then \

	  $(BREAKPAD_DUMP_SYMS) -c $< > $@ ; \

	else \

	  echo "skipped for non-elf file."; \

	  touch $@; \

	fi

$(LOCAL_BUILT_MODULE) : $(breakpad_output)

endif



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

## Strip

###########################################################
@@ -152,6 +132,5 @@ endif # my_strip_module 
$(cleantarget): PRIVATE_CLEAN_FILES += \

    $(linked_module) \

    $(inject_module) \

    $(breakpad_output) \

    $(symbolic_output) \

    $(strip_output)

core/envsetup.mk

+0 −3
Original line number Diff line number Diff line
@@ -987,9 +987,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED := $(TARGET_O 
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED



TARGET_OUT_BREAKPAD := $(PRODUCT_OUT)/breakpad

.KATI_READONLY := TARGET_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

core/soong_cc_rust_prebuilt.mk

+0 −15
Original line number Diff line number Diff line
@@ -196,21 +196,6 @@ ifndef LOCAL_IS_HOST_MODULE 
      ALL_MODULES.$(my_register_name).ELF_SYMBOL_MAPPING_PATH := $(elf_symbol_mapping_path)



      $(LOCAL_BUILT_MODULE): | $(symbolic_output)



      ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

        my_breakpad_path := $(TARGET_OUT_BREAKPAD)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_symbol_path))

        breakpad_output := $(my_breakpad_path)/$(my_installed_module_stem).sym

        $(breakpad_output) : $(LOCAL_SOONG_UNSTRIPPED_BINARY) | $(BREAKPAD_DUMP_SYMS) $(PRIVATE_READELF)

	@echo "target breakpad: $(PRIVATE_MODULE) ($@)"

	@mkdir -p $(dir $@)

	$(hide) if $(PRIVATE_READELF) -S $< > /dev/null 2>&1 ; then \

	  $(BREAKPAD_DUMP_SYMS) -c $< > $@ ; \

	else \

	  echo "skipped for non-elf file."; \

	  touch $@; \

	fi

        $(call add-dependency,$(LOCAL_BUILT_MODULE),$(breakpad_output))

      endif

    endif

  endif

endif