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 /sdk/sdk.go | |
| parent | 4b49b768a2cb7d455aea5347d27d9045b8c481fa (diff) | |
| parent | 7228ecd5e3c9282e7e6f4a81d81fd333cb08eaff (diff) | |
Merge changes I0dcc9c7b,I9bc40642
* changes:
Move cc.imageMutator into the android package
Make CreateVariations return []android.Module
Diffstat (limited to 'sdk/sdk.go')
| -rw-r--r-- | sdk/sdk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go index ed2f26c91..ac6fce989 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -187,7 +187,7 @@ func memberMutator(mctx android.BottomUpMutatorContext) { version = cc.LatestStubsVersionFor(mctx.Config(), name) } mctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{ - {Mutator: "image", Variation: "core"}, + {Mutator: "image", Variation: android.CoreVariation}, {Mutator: "link", Variation: "shared"}, {Mutator: "version", Variation: version}, }...), sdkMemberDepTag, name) |