commit 7d35910451e9c6b4bf776e0782569e9c379278dd
author Logan Chien <loganchien@google.com> Fri Feb 22 09:08:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 22 09:08:03 2019 +0000
tree ea8b565b76bc397f6dd61b7717f31268c61973ab
parent f97ed91448930016f21f35d4ef23eb89a2377ee6
parent 5f4e29b090bf0bd345738951176c2ff4da36a1f6

Merge "Refine lsdump_paths.txt dependencies"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7208fb1..8e74dfe 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4597,9 +4597,3 @@
 ifneq ($(sdk_repo_goal),)
 include $(TOPDIR)development/build/tools/sdk_repo.mk
 endif
-
-#------------------------------------------------------------------
-# Find lsdump paths
-FIND_LSDUMPS_FILE := $(PRODUCT_OUT)/lsdump_paths.txt
-$(FIND_LSDUMPS_FILE) : $(LSDUMP_PATHS)
-	$(hide) rm -rf $@ && echo "$^" | sed -e 's/ /\n/g' > $@

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 3f916ae..f323aae 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1582,8 +1582,15 @@
 .PHONY: findbugs
 findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)
 
+LSDUMP_PATHS_FILE := $(PRODUCT_OUT)/lsdump_paths.txt
+
 .PHONY: findlsdumps
-findlsdumps: $(FIND_LSDUMPS_FILE)
+findlsdumps: $(LSDUMP_PATHS_FILE) $(LSDUMP_PATHS)
+
+$(LSDUMP_PATHS_FILE): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS)
+$(LSDUMP_PATHS_FILE):
+	@echo "Generate $@"
+	@rm -rf $@ && echo "$(PRIVATE_LSDUMP_PATHS)" | sed -e 's/ /\n/g' > $@
 
 .PHONY: check-elf-files
 check-elf-files: