From 3afc3004f2e8f18ee28205d3d63417e29cf5cd5e Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 2 Nov 2022 10:24:04 -0700
Subject: [PATCH] Fix final nits from noticeindex change.

Test: m droid dist cts alllicensemetadata
Change-Id: Ie446e5693a09f4ae1c936cdae6f1e668105541f0
---
 tools/compliance/noticeindex.go                     | 10 ++++------
 tools/compliance/projectmetadata/projectmetadata.go |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tools/compliance/noticeindex.go b/tools/compliance/noticeindex.go
index cb95b76070..dbfede6d94 100644
--- a/tools/compliance/noticeindex.go
+++ b/tools/compliance/noticeindex.go
@@ -231,14 +231,12 @@ func (ni *NoticeIndex) Hashes() chan hash {
 
 // InputFiles returns the complete list of files read during indexing.
 func (ni *NoticeIndex) InputFiles() []string {
-	licenseMeta := []string(nil)
-	for f := range ni.lg.targets {
-		licenseMeta = append(licenseMeta, f)
-	}
 	projectMeta := ni.pmix.AllMetadataFiles()
-	files := make([]string, 0, len(ni.files) + len(licenseMeta) + len(projectMeta))
+	files := make([]string, 0, len(ni.files) + len(ni.lg.targets) + len(projectMeta))
 	files = append(files, ni.files...)
-	files = append(files, licenseMeta...)
+	for f := range ni.lg.targets {
+		files = append(files, f)
+	}
 	files = append(files, projectMeta...)
 	return files
 }
diff --git a/tools/compliance/projectmetadata/projectmetadata.go b/tools/compliance/projectmetadata/projectmetadata.go
index f9ddbae8a1..f0ad7b583c 100644
--- a/tools/compliance/projectmetadata/projectmetadata.go
+++ b/tools/compliance/projectmetadata/projectmetadata.go
@@ -233,7 +233,7 @@ func (ix *Index) MetadataForProjects(projects ...string) ([]*ProjectMetadata, er
 
 // AllMetadataFiles returns the sorted list of all METADATA files read thus far.
 func (ix *Index) AllMetadataFiles() []string {
-	files := []string(nil)
+	var files []string
 	ix.projects.Range(func(key, value any) bool {
 		pi := value.(*projectIndex)
 		if pi.path != "" {