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/arch.go b/android/arch.go
index f8317bb..eaa35a4 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -312,12 +312,12 @@
var multilib string
switch class {
case Device:
- multilib = String(module.base().commonProperties.Target.Android.Compile_multilib)
+ multilib = module.base().commonProperties.Target.Android.Compile_multilib
case Host, HostCross:
- multilib = String(module.base().commonProperties.Target.Host.Compile_multilib)
+ multilib = module.base().commonProperties.Target.Host.Compile_multilib
}
if multilib == "" {
- multilib = String(module.base().commonProperties.Compile_multilib)
+ multilib = module.base().commonProperties.Compile_multilib
}
if multilib == "" {
multilib = module.base().commonProperties.Default_multilib