Revert "Make some common properties overridden when used in defaults modules"
Bug: 68337468
Breaks HOST_PREFER_32BIT=true
This reverts commit 617016a6f2819210894492ef6f095992bf28bcb4.
Change-Id: Ifb20f41cdf93dbfd73a3aac5b055e595e334350b
diff --git a/android/module.go b/android/module.go
index b8c9ab2..1cdc2dd 100644
--- a/android/module.go
+++ b/android/module.go
@@ -165,27 +165,27 @@
// 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 @@
return androidBaseContextImpl{
target: a.commonProperties.CompileTarget,
targetPrimary: a.commonProperties.CompilePrimary,
- vendor: Bool(a.commonProperties.Proprietary) || Bool(a.commonProperties.Vendor),
+ vendor: a.commonProperties.Proprietary || a.commonProperties.Vendor,
config: ctx.Config().(Config),
}
}