diff options
| author | 2019-11-25 22:30:17 +0000 | |
|---|---|---|
| committer | 2019-11-25 22:30:17 +0000 | |
| commit | 09ef474b6f797eb4f81e65b1736be30fbb3dd9cf (patch) | |
| tree | bf03e0eab4434dc6defff90cbe0d0a23e3b78403 /apex/apex.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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex.go b/apex/apex.go index d7f6d5356..4c5e06b8f 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -716,12 +716,12 @@ func (a *apexBundle) installable() bool { func (a *apexBundle) getImageVariation(config android.DeviceConfig) string { if a.vndkApex { - return "vendor." + a.vndkVersion(config) + return cc.VendorVariationPrefix + a.vndkVersion(config) } if config.VndkVersion() != "" && proptools.Bool(a.properties.Use_vendor) { - return "vendor." + config.PlatformVndkVersion() + return cc.VendorVariationPrefix + config.PlatformVndkVersion() } else { - return "core" + return android.CoreVariation } } |