diff options
author | Colin Cross <ccross@android.com> | 2016-07-12 13:11:25 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-07-12 13:11:26 -0700 |
commit | a4190c10eb851edf04e6d034e103165f287e66ff (patch) | |
tree | 64d622768f62104d0fb45af134eb15a34a35dcd3 | |
parent | 624b8ed0b3c428ecc538641ec98e6989892ad742 (diff) | |
download | build_soong-a4190c10eb851edf04e6d034e103165f287e66ff.tar.gz build_soong-a4190c10eb851edf04e6d034e103165f287e66ff.tar.bz2 build_soong-a4190c10eb851edf04e6d034e103165f287e66ff.zip |
Make Host/Device_supported *bool
When collapsing properties for applying defaults, bool is ORed, *bool is
replaced, which is the behavior we want here.
Change-Id: I40ac5035bedcd4b1bbf50e054f8527523f9f6f79
-rw-r--r-- | android/module.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/module.go b/android/module.go index 0e608d77..a00cb7d0 100644 --- a/android/module.go +++ b/android/module.go @@ -123,8 +123,8 @@ type commonProperties struct { } type hostAndDeviceProperties struct { - Host_supported bool - Device_supported bool + Host_supported *bool + Device_supported *bool } type Multilib string @@ -170,7 +170,7 @@ func InitAndroidArchModule(m Module, hod HostOrDeviceSupported, defaultMultilib case HostAndDeviceSupported: // Default to module to device supported, host not supported, can override in module // properties - base.hostAndDeviceProperties.Device_supported = true + base.hostAndDeviceProperties.Device_supported = boolPtr(true) fallthrough case HostAndDeviceDefault: propertyStructs = append(propertyStructs, &base.hostAndDeviceProperties) @@ -274,10 +274,10 @@ func (a *ModuleBase) OsClassSupported() []OsClass { return []OsClass{Device} case HostAndDeviceSupported: var supported []OsClass - if a.hostAndDeviceProperties.Host_supported { + if Bool(a.hostAndDeviceProperties.Host_supported) { supported = append(supported, Host, HostCross) } - if a.hostAndDeviceProperties.Device_supported { + if Bool(a.hostAndDeviceProperties.Device_supported) { supported = append(supported, Device) } return supported @@ -289,7 +289,7 @@ func (a *ModuleBase) OsClassSupported() []OsClass { func (a *ModuleBase) DeviceSupported() bool { return a.commonProperties.HostOrDeviceSupported == DeviceSupported || a.commonProperties.HostOrDeviceSupported == HostAndDeviceSupported && - a.hostAndDeviceProperties.Device_supported + Bool(a.hostAndDeviceProperties.Device_supported) } func (a *ModuleBase) Enabled() bool { |