diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/android/module.go b/android/module.go index 45afec146..aaaa2fbf2 100644 --- a/android/module.go +++ b/android/module.go @@ -118,7 +118,18 @@ 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 + Compile_multilib string `android:"arch_variant"` + + Target struct { + Host struct { + Compile_multilib string + } + Android struct { + Compile_multilib string + } + } + + Default_multilib string `blueprint:"mutated"` // whether this is a proprietary vendor module, and should be installed into /vendor Proprietary bool @@ -182,7 +193,7 @@ func InitAndroidArchModule(m Module, hod HostOrDeviceSupported, defaultMultilib base := m.base() base.commonProperties.HostOrDeviceSupported = hod - base.commonProperties.Compile_multilib = string(defaultMultilib) + base.commonProperties.Default_multilib = string(defaultMultilib) switch hod { case HostAndDeviceSupported: |