diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/genrule.go | 2 | ||||
| -rw-r--r-- | cc/image.go | 27 | ||||
| -rw-r--r-- | cc/library_stub.go | 2 |
3 files changed, 15 insertions, 16 deletions
diff --git a/cc/genrule.go b/cc/genrule.go index 431a01c98..cd06818a3 100644 --- a/cc/genrule.go +++ b/cc/genrule.go @@ -114,5 +114,5 @@ func (g *GenruleExtraProperties) ExtraImageVariations(ctx android.BaseModuleCont return variants } -func (g *GenruleExtraProperties) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) { +func (g *GenruleExtraProperties) SetImageVariation(ctx android.BaseModuleContext, variation string) { } diff --git a/cc/image.go b/cc/image.go index f8c5ca5f1..28692d863 100644 --- a/cc/image.go +++ b/cc/image.go @@ -628,30 +628,29 @@ func squashRamdiskSrcs(m *Module) { } } -func (c *Module) SetImageVariation(ctx android.BaseModuleContext, variant string, module android.Module) { - m := module.(*Module) +func (c *Module) SetImageVariation(ctx android.BaseModuleContext, variant string) { if variant == android.RamdiskVariation { - m.MakeAsPlatform() - squashRamdiskSrcs(m) + c.MakeAsPlatform() + squashRamdiskSrcs(c) } else if variant == android.VendorRamdiskVariation { - m.MakeAsPlatform() - squashVendorRamdiskSrcs(m) + c.MakeAsPlatform() + squashVendorRamdiskSrcs(c) } else if variant == android.RecoveryVariation { - m.MakeAsPlatform() - squashRecoverySrcs(m) + c.MakeAsPlatform() + squashRecoverySrcs(c) } else if strings.HasPrefix(variant, VendorVariation) { - m.Properties.ImageVariation = VendorVariation + c.Properties.ImageVariation = VendorVariation if strings.HasPrefix(variant, VendorVariationPrefix) { - m.Properties.VndkVersion = strings.TrimPrefix(variant, VendorVariationPrefix) + c.Properties.VndkVersion = strings.TrimPrefix(variant, VendorVariationPrefix) } - squashVendorSrcs(m) + squashVendorSrcs(c) } else if strings.HasPrefix(variant, ProductVariation) { - m.Properties.ImageVariation = ProductVariation + c.Properties.ImageVariation = ProductVariation if strings.HasPrefix(variant, ProductVariationPrefix) { - m.Properties.VndkVersion = strings.TrimPrefix(variant, ProductVariationPrefix) + c.Properties.VndkVersion = strings.TrimPrefix(variant, ProductVariationPrefix) } - squashProductSrcs(m) + squashProductSrcs(c) } if c.NeedsVendorPublicLibraryVariants() && diff --git a/cc/library_stub.go b/cc/library_stub.go index 746b95171..9643ec2a1 100644 --- a/cc/library_stub.go +++ b/cc/library_stub.go @@ -511,5 +511,5 @@ func (v *CcApiVariant) ExtraImageVariations(ctx android.BaseModuleContext) []str return variations } -func (v *CcApiVariant) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) { +func (v *CcApiVariant) SetImageVariation(ctx android.BaseModuleContext, variation string) { } |