tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check that a product variable is set

Browse source 
Store product variables in pointers so that we can only apply the
properties if the product variable was set to a value.  Also only apply
bool properties if they are true, adn rearrange the code to do the
cheapest checks first.

Remove device_uses_logd, it doesn't exist any more.

Change-Id: Icf42408f57bd611746f8d985bfceb50c7f95ea59
This commit is contained in:
Colin Cross 2015-09-16 13:53:42 -07:00
parent b43a159c13
commit a6bc19e415
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
common/variable.go
View file

@ -31,10 +31,6 @@ func init() {
type variableProperties struct {
Product_variables struct {
Device_uses_logd struct {
Cflags []string
Srcs []string
}
Device_uses_dlmalloc struct {
Cflags []string
Srcs []string
@ -54,16 +50,18 @@ type variableProperties struct {
var zeroProductVariables variableProperties
type productVariables struct {
Device_uses_logd bool
Device_uses_jemalloc bool
Device_uses_dlmalloc bool
Dlmalloc_alignment int
Device_uses_jemalloc *bool `json:",omitempty"`
Device_uses_dlmalloc *bool `json:",omitempty"`
Dlmalloc_alignment *int `json:",omitempty"`
}
func boolPtr(v bool) *bool {
return &v
}
func (productVariables) DefaultConfig() jsonConfigurable {
v := productVariables{
Device_uses_logd: true,
Device_uses_jemalloc: true,
Device_uses_jemalloc: boolPtr(true),
}
return v
}
@ -83,18 +81,28 @@ func VariableMutator(mctx blueprint.EarlyMutatorContext) {
for i := 0; i < variableValues.NumField(); i++ {
variableValue := variableValues.Field(i)
zeroValue := zeroValues.Field(i)
if reflect.DeepEqual(variableValue, zeroValue) {
continue
}
name := variableValues.Type().Field(i).Name
property := "product_variables." + proptools.PropertyNameForField(name)
// Check that the variable was set for the product
val := reflect.ValueOf(mctx.Config().(Config).ProductVariables).FieldByName(name)
if mctx.ContainsProperty(property) && val.IsValid() {
a.setVariableProperties(mctx, property, variableValue, val.Interface())
if !val.IsValid() || val.Kind() != reflect.Ptr || val.IsNil() {
continue
}
val = val.Elem()
// For bools, check that the value is true
if val.Kind() == reflect.Bool && val.Bool() == false {
continue
}
// Check if any properties were set for the module
if reflect.DeepEqual(variableValue.Interface(), zeroValue.Interface()) {
continue
}
a.setVariableProperties(mctx, property, variableValue, val.Interface())
}
}