From 96e5e41b88a30afc4710a9add6ea27bec6ff38bd Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 6 Jul 2020 17:13:43 -0700
Subject: [PATCH] Dist module_paths/files.db

Help debugging finder issues by disting module_paths/files.db for
later analysis.

Bug: 157656545
Test: treehugger
Change-Id: Idfa4cffe7ef724b399a2667efd487f9c3c76bb6b
---
 finder/finder.go   | 11 ++++++-----
 ui/build/finder.go |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/finder/finder.go b/finder/finder.go
index f20bed29e..6513fa301 100644
--- a/finder/finder.go
+++ b/finder/finder.go
@@ -325,7 +325,12 @@ func (f *Finder) FindMatching(rootPath string, filter WalkFunc) []string {
 // Shutdown declares that the finder is no longer needed and waits for its cleanup to complete
 // Currently, that only entails waiting for the database dump to complete.
 func (f *Finder) Shutdown() {
-	f.waitForDbDump()
+	f.WaitForDbDump()
+}
+
+// WaitForDbDump returns once the database has been written to f.DbPath.
+func (f *Finder) WaitForDbDump() {
+	f.shutdownWaitgroup.Wait()
 }
 
 // End of public api
@@ -345,10 +350,6 @@ func (f *Finder) goDumpDb() {
 	}
 }
 
-func (f *Finder) waitForDbDump() {
-	f.shutdownWaitgroup.Wait()
-}
-
 // joinCleanPaths is like filepath.Join but is faster because
 // joinCleanPaths doesn't have to support paths ending in "/" or containing ".."
 func joinCleanPaths(base string, leaf string) string {
diff --git a/ui/build/finder.go b/ui/build/finder.go
index 6786337be..c019ea2d6 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -126,6 +126,11 @@ func FindSources(ctx Context, config Config, f *finder.Finder) {
 	if err != nil {
 		ctx.Fatalf("Could not find modules: %v", err)
 	}
+
+	if config.Dist() {
+		f.WaitForDbDump()
+		distFile(ctx, config, f.DbPath, "module_paths")
+	}
 }
 
 func dumpListToFile(ctx Context, config Config, list []string, filePath string) (err error) {