commit 5cbf33afe925d51b7e92cdcca8ec22cdd81fcf1c
author Hsin-Yi Chen <hsinyichen@google.com> Wed Jul 31 17:36:05 2019 +0800
committer Hsin-Yi Chen <hsinyichen@google.com> Mon Aug 05 11:20:22 2019 +0800
tree 588f32e78425f002460e88c100aaa305fb3188a3
parent 2cd7eaaf137d0eb35ef576d82b526eeac990f9a2

Add tags to lsdump_paths.txt

- Update the conversion from LSDUMP_PATHS to lsdump_paths.txt.
  LSDUMP_PATHS is a list of "tag:path". Each element is converted to
  "tag: path\n" in lsdump_paths.txt.

- Update the check for redundant ABI dumps.
  prebuilts/abi-dumps/ndk contains the ABI dumps for NDK.
  prebuilts/abi-dumps/vndk contains those for LLNDK, VNDK-core, VNDK-SP,
  except NDK.

Test: make findlsdumps
Bug: 133176785
Change-Id: I90559e6c68a7f901a318cd8d5125e9a7401ac22c

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index b7b6cd0..27529c9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1856,12 +1856,13 @@
 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: