aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-05-06 17:21:20 -0700
committerDan Willemsen <dwillemsen@google.com>2016-05-07 00:29:22 +0000
commitb485099badf27dee6f92a0492aa85e3e28c4a485 (patch)
treef71b342b126f21511db851aa02f148548f83fe6f
parent162d08f35e670dec6f5359f339c9e602fd847af1 (diff)
downloadbuild_soong-b485099badf27dee6f92a0492aa85e3e28c4a485.tar.gz
build_soong-b485099badf27dee6f92a0492aa85e3e28c4a485.tar.bz2
build_soong-b485099badf27dee6f92a0492aa85e3e28c4a485.zip
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
-rw-r--r--common/arch.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/arch.go b/common/arch.go
index 23ec5500..8ad50871 100644
--- a/common/arch.go
+++ b/common/arch.go
@@ -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