diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-09 21:03:53 +0000 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-15 14:38:40 -0800 |
| commit | 27e284d2b0d393b228953e757b22a5e0db1417e3 (patch) | |
| tree | f56287633cba57c3f703e5bc6857e3f2a0a02868 /python | |
| parent | 2e6a4ff3beaff084082a054c668ec5b6d29ffdf7 (diff) | |
| download | build_soong-27e284d2b0d393b228953e757b22a5e0db1417e3.tar.gz build_soong-27e284d2b0d393b228953e757b22a5e0db1417e3.tar.bz2 build_soong-27e284d2b0d393b228953e757b22a5e0db1417e3.zip | |
Revert "Revert "Support filegroup in exclude_srcs""
This reverts commit 606e9de344fae07473dd79e5ac556886a72035de.
Reason for revert: <try to fix the broken build yesterday>
Change-Id: I2963b9af63c7c7398159e5e9a1e448266e1c81d5
Test: unittest
Diffstat (limited to 'python')
| -rw-r--r-- | python/python.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python/python.go b/python/python.go index 9a3b1bbc..ed879eb0 100644 --- a/python/python.go +++ b/python/python.go @@ -266,11 +266,13 @@ func (p *Module) DepsMutator(ctx android.BottomUpMutatorContext) { android.ExtractSourcesDeps(ctx, p.properties.Data) // deps from "srcs". android.ExtractSourcesDeps(ctx, p.properties.Srcs) + android.ExtractSourcesDeps(ctx, p.properties.Exclude_srcs) switch p.properties.Actual_version { case pyVersion2: // deps from "version.py2.srcs" property. android.ExtractSourcesDeps(ctx, p.properties.Version.Py2.Srcs) + android.ExtractSourcesDeps(ctx, p.properties.Version.Py2.Exclude_srcs) ctx.AddVariationDependencies(nil, pythonLibTag, uniqueLibs(ctx, p.properties.Libs, "version.py2.libs", @@ -286,6 +288,7 @@ func (p *Module) DepsMutator(ctx android.BottomUpMutatorContext) { case pyVersion3: // deps from "version.py3.srcs" property. android.ExtractSourcesDeps(ctx, p.properties.Version.Py3.Srcs) + android.ExtractSourcesDeps(ctx, p.properties.Version.Py3.Exclude_srcs) ctx.AddVariationDependencies(nil, pythonLibTag, uniqueLibs(ctx, p.properties.Libs, "version.py3.libs", |