diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-11-09 14:05:27 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2015-11-09 14:05:27 -0800 |
commit | 53aa1f62e41d0053a0616385d8e909a2e34dd69b (patch) | |
tree | 8a74f138746b611cf12173e4bcf40f415847b4b6 /common | |
parent | cfad119eaf895cd0d9897f96af27ba7b2b0846a1 (diff) | |
download | build_soong-53aa1f62e41d0053a0616385d8e909a2e34dd69b.tar.gz build_soong-53aa1f62e41d0053a0616385d8e909a2e34dd69b.tar.bz2 build_soong-53aa1f62e41d0053a0616385d8e909a2e34dd69b.zip |
Switch Disabled to a *bool for proper arch overrides
Change-Id: I0b26d9ae2443825479713f49c5eb704597522ec8
Diffstat (limited to 'common')
-rw-r--r-- | common/module.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common/module.go b/common/module.go index 69da7c60..cb38513c 100644 --- a/common/module.go +++ b/common/module.go @@ -24,6 +24,7 @@ import ( "android/soong/glob" "github.com/google/blueprint" + "github.com/google/blueprint/proptools" ) var ( @@ -78,7 +79,7 @@ type commonProperties struct { Tags []string // don't emit any build rules for this module - Disabled bool `android:"arch_variant"` + Disabled *bool `android:"arch_variant"` // control whether this module compiles for 32-bit, 64-bit, or both. Possible values // are "32" (compile for 32-bit only), "64" (compile for 64-bit only), "both" (compile for both @@ -230,7 +231,7 @@ func (a *AndroidModuleBase) DeviceSupported() bool { } func (a *AndroidModuleBase) Disabled() bool { - return a.commonProperties.Disabled + return proptools.Bool(a.commonProperties.Disabled) } func (a *AndroidModuleBase) computeInstallDeps( @@ -321,7 +322,7 @@ func (a *AndroidModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) { installFiles: a.installFiles, } - if a.commonProperties.Disabled { + if proptools.Bool(a.commonProperties.Disabled) { return } |