summaryrefslogtreecommitdiff
path: root/sysprop
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-11-25 22:30:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-11-25 22:30:17 +0000
commit09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch)
treebf03e0eab4434dc6defff90cbe0d0a23e3b78403 /sysprop
parent4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff)
parent7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff)
Merge changes I0dcc9c7b,I9bc40642
* changes: Move cc.imageMutator into the android package Make CreateVariations return []android.Module
Diffstat (limited to 'sysprop')
-rw-r--r--sysprop/sysprop_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index 80dcb7217..5e0eb35c7 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -73,7 +73,7 @@ func testContext(config android.Config, bp string,
ctx.RegisterModuleType("llndk_library", cc.LlndkLibraryFactory)
ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
- ctx.BottomUp("image", cc.ImageMutator).Parallel()
+ ctx.BottomUp("image", android.ImageMutator).Parallel()
ctx.BottomUp("link", cc.LinkageMutator).Parallel()
ctx.BottomUp("vndk", cc.VndkMutator).Parallel()
ctx.BottomUp("version", cc.VersionMutator).Parallel()