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

Commit 72053613 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by Gerrit Code Review
Browse files

Merge "Add tags to lsdump_paths.txt"

parents fd25038f 5cbf33af

core/main.mk

+3 −2
Original line number Diff line number Diff line
@@ -1778,12 +1778,13 @@ findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET) 
LSDUMP_PATHS_FILE := $(PRODUCT_OUT)/lsdump_paths.txt



.PHONY: findlsdumps

findlsdumps: $(LSDUMP_PATHS_FILE) $(LSDUMP_PATHS)

# LSDUMP_PATHS is a list of tag:path.

findlsdumps: $(LSDUMP_PATHS_FILE) $(foreach p,$(LSDUMP_PATHS),$(call word-colon,2,$(p)))



$(LSDUMP_PATHS_FILE): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS)

$(LSDUMP_PATHS_FILE):

	@echo "Generate $@"

	@rm -rf $@ && echo "$(PRIVATE_LSDUMP_PATHS)" | sed -e 's/ /\n/g' > $@

	@rm -rf $@ && echo -e "$(subst :,:$(space),$(subst $(space),\n,$(PRIVATE_LSDUMP_PATHS)))" > $@



.PHONY: check-elf-files

check-elf-files:

target/product/gsi/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -120,13 +120,13 @@ NDK_ABI_DUMPS := $(call find-abi-dump-paths,$(NDK_ABI_DUMP_DIR)) 


$(check-vndk-abi-dump-list-timestamp): $(VNDK_ABI_DUMPS) $(NDK_ABI_DUMPS)

	$(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \

	  $(addsuffix .so.lsdump,$(VNDK_SAMEPROCESS_LIBRARIES) $(VNDK_CORE_LIBRARIES)), \

	  $(addsuffix .so.lsdump,$(filter-out $(NDK_MIGRATED_LIBS) $(VNDK_PRIVATE_LIBRARIES),$(LLNDK_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(VNDK_CORE_LIBRARIES))), \

	  $(notdir $(VNDK_ABI_DUMPS))))))

	$(if $(added_vndk_abi_dumps), \

	  echo -e "Found ABI reference dumps for non-VNDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dumps.")



	$(eval added_ndk_abi_dumps := $(strip $(sort $(filter-out \

	  $(addsuffix .so.lsdump,$(NDK_MIGRATED_LIBS) $(LLNDK_LIBRARIES)), \

	  $(addsuffix .so.lsdump,$(NDK_MIGRATED_LIBS)), \

	  $(notdir $(NDK_ABI_DUMPS))))))

	$(if $(added_ndk_abi_dumps), \

	  echo -e "Found ABI reference dumps for non-NDK libraries. Run \`find \$${ANDROID_BUILD_TOP}/$(NDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_ndk_abi_dumps)) ')' -delete\` to delete the dumps.")