diff options
| author | Colin Cross <ccross@android.com> | 2015-04-08 11:21:40 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-08 15:19:30 -0700 |
| commit | fce532760f1d22c23df764aefbd3e08592c76105 (patch) | |
| tree | f11f10e878c4634e489543625989187b750afb99 /genrule | |
| parent | 1332b0035caf416d4d9b275e6bfead48fe0b9cac (diff) | |
| download | build_soong-fce532760f1d22c23df764aefbd3e08592c76105.tar.gz build_soong-fce532760f1d22c23df764aefbd3e08592c76105.tar.bz2 build_soong-fce532760f1d22c23df764aefbd3e08592c76105.zip | |
Support subtracting sources from globs
Support -file or -path/glob in file lists that contain globs to
subtract files from the resulting glob. Also move source file
prefixing and handling into a common function.
Change-Id: Ib6d74ce22f53cae7348c4ba35b779976d90359a6
Diffstat (limited to 'genrule')
| -rw-r--r-- | genrule/genrule.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/genrule/genrule.go b/genrule/genrule.go index 589758d8..1361631a 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -67,9 +67,7 @@ func (g *genSrcs) GenerateAndroidBuildActions(ctx common.AndroidModuleContext) { Command: g.properties.Cmd, }) - srcFiles := g.properties.Srcs - srcFiles = pathtools.PrefixPaths(srcFiles, common.ModuleSrcDir(ctx)) - srcFiles = common.ExpandGlobs(ctx, srcFiles) + srcFiles := common.ExpandSources(ctx, g.properties.Srcs) g.outputFiles = make([]string, 0, len(srcFiles)) |