diff options
| author | Colin Cross <ccross@android.com> | 2019-03-04 22:35:41 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-07 18:36:35 +0000 |
| commit | 27b922f53e938896c0a693a1d9f50e6c9e686ad7 (patch) | |
| tree | d3383cbdebb9fb78d8d96fa3a3023764620d483e /genrule | |
| parent | 1b48842a4b83ba6234d26ff4c77a0884f5008f62 (diff) | |
| download | build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.tar.gz build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.tar.bz2 build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.zip | |
Annotate paths and deprecate ExtractSource(s)Deps
Add `android:"path"` to all properties that take paths to source
files, and remove the calls to ExtractSource(s)Deps, the
pathsDepsMutator will add the necessary SourceDepTag dependency.
Test: All soong tests
Change-Id: I488ba1a5d680aaa50b04fc38acf693e23c6d4d6d
Diffstat (limited to 'genrule')
| -rw-r--r-- | genrule/genrule.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/genrule/genrule.go b/genrule/genrule.go index 47d88c33..f265eb60 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -83,16 +83,16 @@ type generatorProperties struct { Tools []string // Local file that is used as the tool - Tool_files []string + Tool_files []string `android:"path"` // List of directories to export generated headers from Export_include_dirs []string // list of input files - Srcs []string `android:"arch_variant"` + Srcs []string `android:"path,arch_variant"` // input files to exclude - Exclude_srcs []string `android:"arch_variant"` + Exclude_srcs []string `android:"path,arch_variant"` } type Module struct { @@ -143,8 +143,6 @@ func (g *Module) GeneratedDeps() android.Paths { } func (g *Module) DepsMutator(ctx android.BottomUpMutatorContext) { - android.ExtractSourcesDeps(ctx, g.properties.Srcs) - android.ExtractSourcesDeps(ctx, g.properties.Tool_files) if g, ok := ctx.Module().(*Module); ok { for _, tool := range g.properties.Tools { tag := hostToolDependencyTag{label: tool} |