diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-11-01 09:32:53 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2017-11-01 09:32:53 +0000 |
| commit | 5c3c7681872ec2379685931e8160bc2524b6bb2d (patch) | |
| tree | acee6b99bc59a822afb1ddb8bd84727ba7c37faf /android/arch.go | |
| parent | 617016a6f2819210894492ef6f095992bf28bcb4 (diff) | |
| download | build_soong-5c3c7681872ec2379685931e8160bc2524b6bb2d.tar.gz build_soong-5c3c7681872ec2379685931e8160bc2524b6bb2d.tar.bz2 build_soong-5c3c7681872ec2379685931e8160bc2524b6bb2d.zip | |
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
Diffstat (limited to 'android/arch.go')
| -rw-r--r-- | android/arch.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/arch.go b/android/arch.go index f8317bbc..eaa35a4a 100644 --- a/android/arch.go +++ b/android/arch.go @@ -312,12 +312,12 @@ func archMutator(mctx BottomUpMutatorContext) { 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 |