summaryrefslogtreecommitdiff
path: root/cc/testing.go
diff options
context:
space:
mode:
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
commit09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch)
treebf03e0eab4434dc6defff90cbe0d0a23e3b78403 /cc/testing.go
parent4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff)
parent7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff)
Merge changes I0dcc9c7b,I9bc40642
* changes: Move cc.imageMutator into the android package Make CreateVariations return []android.Module
Diffstat (limited to 'cc/testing.go')
-rw-r--r--cc/testing.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/testing.go b/cc/testing.go
index 3943e72cc..3b10f876f 100644
--- a/cc/testing.go
+++ b/cc/testing.go
@@ -271,7 +271,7 @@ func CreateTestContext(bp string, fs map[string][]byte,
ctx.RegisterModuleType("vndk_prebuilt_shared", VndkPrebuiltSharedFactory)
ctx.RegisterModuleType("vndk_libraries_txt", VndkLibrariesTxtFactory)
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
- ctx.BottomUp("image", ImageMutator).Parallel()
+ ctx.BottomUp("image", android.ImageMutator).Parallel()
ctx.BottomUp("link", LinkageMutator).Parallel()
ctx.BottomUp("vndk", VndkMutator).Parallel()
ctx.BottomUp("version", VersionMutator).Parallel()