diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-06-30 18:15:24 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-07-01 20:59:39 +0000 |
| commit | 2ef08f4458aaeb1cf69a167107d52a2ca22ba3f3 (patch) | |
| tree | e315609987dd9b06d1d85f379149e2b64e7bac5d /genrule | |
| parent | c41f63071ebdb34fea48c11bc94b6e4a7e159c06 (diff) | |
| download | build_soong-2ef08f4458aaeb1cf69a167107d52a2ca22ba3f3.tar.gz build_soong-2ef08f4458aaeb1cf69a167107d52a2ca22ba3f3.tar.bz2 build_soong-2ef08f4458aaeb1cf69a167107d52a2ca22ba3f3.zip | |
Add exclude_* and remove arch_subtract / "-file"
To align with the current make build system, add exclude_srcs and
exclude_java_resource_dirs. These replace the functionality of
arch_subtract and glob exclusions that use "-file" to exclude a file.
Change-Id: I91c23d5e3c9409f2d9f7921f950153a03a68ad61
Diffstat (limited to 'genrule')
| -rw-r--r-- | genrule/genrule.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/genrule/genrule.go b/genrule/genrule.go index b3938318..2052dfdd 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -134,7 +134,7 @@ func GenSrcsFactory() (blueprint.Module, []interface{}) { properties := &genSrcsProperties{} tasks := func(ctx common.AndroidModuleContext) []generateTask { - srcFiles := ctx.ExpandSources(properties.Srcs) + srcFiles := ctx.ExpandSources(properties.Srcs, nil) tasks := make([]generateTask, 0, len(srcFiles)) for _, in := range srcFiles { out := pathtools.ReplaceExtension(in, properties.Output_extension) @@ -161,7 +161,7 @@ func GenRuleFactory() (blueprint.Module, []interface{}) { tasks := func(ctx common.AndroidModuleContext) []generateTask { return []generateTask{ { - in: ctx.ExpandSources(properties.Srcs), + in: ctx.ExpandSources(properties.Srcs, nil), out: filepath.Join(common.ModuleGenDir(ctx), properties.Out), }, } |