commit b485099badf27dee6f92a0492aa85e3e28c4a485
author Dan Willemsen <dwillemsen@google.com> Fri May 06 17:21:20 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Sat May 07 00:29:22 2016 +0000
tree f71b342b126f21511db851aa02f148548f83fe6f
parent 162d08f35e670dec6f5359f339c9e602fd847af1

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

common/arch.go

diff --git a/common/arch.go b/common/arch.go
index 23ec550..8ad5087 100644
--- a/common/arch.go
+++ b/common/arch.go
@@ -1020,7 +1020,7 @@
 	}
 
 	if featureMap, ok := archFeatureMap[archType]; ok {
-		a.ArchFeatures = featureMap[stringPtr(archVariant)]
+		a.ArchFeatures = featureMap[a.ArchVariant]
 	}
 
 	return a, nil