Quote glob exclude options
Put quotes around the glob exclude options to avoid accidentally
expanding globs during execution.
Change-Id: Ia6fc7fa7dbe1d75e97d6039642e1c89be027689a
diff --git a/common/glob.go b/common/glob.go
index 7bb623d..f4e083a 100644
--- a/common/glob.go
+++ b/common/glob.go
@@ -17,7 +17,6 @@
import (
"fmt"
"path/filepath"
- "strings"
"github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
@@ -113,10 +112,6 @@
func GlobRule(ctx AndroidModuleContext, globPattern string, excludes []string,
fileListFile, depFile string) {
- var excludeArgs []string
- for _, e := range excludes {
- excludeArgs = append(excludeArgs, "-e "+e)
- }
// Create a rule to rebuild fileListFile if a directory in depFile changes. fileListFile
// will only be rewritten if it has changed, preventing unnecesary build.ninja regenerations.
@@ -126,7 +121,7 @@
Implicits: []string{globCmd},
Args: map[string]string{
"glob": globPattern,
- "excludes": strings.Join(excludeArgs, " "),
+ "excludes": JoinWithPrefixAndQuote(excludes, "-e "),
},
})