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/androidmk.go b/android/androidmk.go
index 2cae1c3..759d328 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -231,10 +231,10 @@
if len(amod.commonProperties.Init_rc) > 0 {
fmt.Fprintln(&data.preamble, "LOCAL_INIT_RC := ", strings.Join(amod.commonProperties.Init_rc, " "))
}
- if Bool(amod.commonProperties.Proprietary) {
+ if amod.commonProperties.Proprietary {
fmt.Fprintln(&data.preamble, "LOCAL_PROPRIETARY_MODULE := true")
}
- if Bool(amod.commonProperties.Vendor) {
+ if amod.commonProperties.Vendor {
fmt.Fprintln(&data.preamble, "LOCAL_VENDOR_MODULE := true")
}
if amod.commonProperties.Owner != nil {