Fix product variables with no soong.variables
If soong.variables didn't exist, loadFromConfigFile would write default
values to soong.variables, but return with the product variables set to
the zero values. Replace jsonConfigurable.DefaultConfig() with
SetDefaultConfig() that modifies the current object, and call it before
writing the values.
Change-Id: I7b7404c7a51975dc4493e25c775b3cf56ef335e3
diff --git a/common/variable.go b/common/variable.go
index 5116a95..a395b41 100644
--- a/common/variable.go
+++ b/common/variable.go
@@ -84,8 +84,8 @@
return &v
}
-func (productVariables) DefaultConfig() jsonConfigurable {
- v := productVariables{
+func (v *productVariables) SetDefaultConfig() {
+ *v = productVariables{
Device_uses_jemalloc: boolPtr(true),
Platform_sdk_version: intPtr(22),
HostArch: stringPtr("x86_64"),
@@ -98,7 +98,6 @@
DeviceSecondaryCpuVariant: stringPtr("cortex-a15"),
DeviceSecondaryAbi: &[]string{"armeabi-v7a"},
}
- return v
}
func VariableMutator(mctx blueprint.EarlyMutatorContext) {