Revert "Revert "Make some common properties overridden when used in defaults modules""

This reverts commit 5c3c768187.

This reapplies I70e45caa92f65dc6a3bc81ae33a5a8f34ad11890 along with
additional changes in other projects to match the new types.

Bug: 68337468
Test: m checkbuild
Change-Id: I2d2d876b291869f834a6468d3e2ad99148f94a15
This commit is contained in:
Colin Cross
2017-11-01 10:38:29 -07:00
parent 5c3c768187
commit 7d716baedf
3 changed files with 11 additions and 11 deletions

View File

@@ -165,27 +165,27 @@ type commonProperties struct {
// are "32" (compile for 32-bit only), "64" (compile for 64-bit only), "both" (compile for both
// architectures), or "first" (compile for 64-bit on a 64-bit platform, and 32-bit on a 32-bit
// platform
Compile_multilib string `android:"arch_variant"`
Compile_multilib *string `android:"arch_variant"`
Target struct {
Host struct {
Compile_multilib string
Compile_multilib *string
}
Android struct {
Compile_multilib string
Compile_multilib *string
}
}
Default_multilib string `blueprint:"mutated"`
// whether this is a proprietary vendor module, and should be installed into /vendor
Proprietary bool
Proprietary *bool
// vendor who owns this module
Owner *string
// whether this module is device specific and should be installed into /vendor
Vendor bool
Vendor *bool
// *.logtags files, to combine together in order to generate the /system/etc/event-log-tags
// file
@@ -519,7 +519,7 @@ func (a *ModuleBase) androidBaseContextFactory(ctx blueprint.BaseModuleContext)
return androidBaseContextImpl{
target: a.commonProperties.CompileTarget,
targetPrimary: a.commonProperties.CompilePrimary,
vendor: a.commonProperties.Proprietary || a.commonProperties.Vendor,
vendor: Bool(a.commonProperties.Proprietary) || Bool(a.commonProperties.Vendor),
config: ctx.Config().(Config),
}
}