Fix ArchFeatures decoding with default ArchVariant

We were using the original ArchVariant passed in, not the blank string
that we reset it to if it's considered the default variant.

Change-Id: Ice644cc1d4897af99fe79b55d441f406a7a270de
This commit is contained in:
Dan Willemsen
2016-05-06 17:21:20 -07:00
parent 162d08f35e
commit b485099bad

View File

@@ -1020,7 +1020,7 @@ func decodeArch(arch string, archVariant, cpuVariant *string, abi *[]string) (Ar
}
if featureMap, ok := archFeatureMap[archType]; ok {
a.ArchFeatures = featureMap[stringPtr(archVariant)]
a.ArchFeatures = featureMap[a.ArchVariant]
}
return a, nil