diff options
author | Colin Cross <ccross@android.com> | 2019-11-25 22:30:17 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-25 22:30:17 +0000 |
commit | 09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch) | |
tree | bf03e0eab4434dc6defff90cbe0d0a23e3b78403 /rust/testing.go | |
parent | 4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff) | |
parent | 7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff) | |
download | build_soong-09ef474b6f797eb4f81e65b1736be30fbb3dd9cf.tar.gz build_soong-09ef474b6f797eb4f81e65b1736be30fbb3dd9cf.tar.bz2 build_soong-09ef474b6f797eb4f81e65b1736be30fbb3dd9cf.zip |
Merge changes I0dcc9c7b,I9bc40642
* changes:
Move cc.imageMutator into the android package
Make CreateVariations return []android.Module
Diffstat (limited to 'rust/testing.go')
-rw-r--r-- | rust/testing.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/testing.go b/rust/testing.go index fbded732..45dbbbdc 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -185,7 +185,7 @@ func CreateTestContext(bp string) *android.TestContext { ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory) ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { // cc mutators - ctx.BottomUp("image", cc.ImageMutator).Parallel() + ctx.BottomUp("image", android.ImageMutator).Parallel() ctx.BottomUp("link", cc.LinkageMutator).Parallel() ctx.BottomUp("version", cc.VersionMutator).Parallel() ctx.BottomUp("begin", cc.BeginMutator).Parallel() |