StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ArchType instead of string as map key

Browse Source 
There is no need to convert ArchType to a string, it can be used
as a map key directly.  It will also be implicity stringified when
passed as a %q parameter to fmt.Errorf.

Test: builds
Change-Id: I5c316fb543108cb88c0c9c1ebafc1bf0050d143e
This commit is contained in:
Colin Cross
2017-04-13 13:00:26 -07:00
parent d4025826c3
commit ce87b801ea
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/ndk_library.go
View File

@@ -116,19 +116,18 @@ func normalizeNdkApiLevel(apiLevel string, arch android.Arch) (string, error) {
}
minVersion := 9 // Minimum version supported by the NDK.
firstArchVersions := map[string]int{
"arm": 9,
"arm64": 21,
"mips": 9,
"mips64": 21,
"x86": 9,
"x86_64": 21,
firstArchVersions := map[android.ArchType]int{
android.Arm: 9,
android.Arm64: 21,
android.Mips: 9,
android.Mips64: 21,
android.X86: 9,
android.X86_64: 21,
}
archStr := arch.ArchType.String()
firstArchVersion, ok := firstArchVersions[archStr]
firstArchVersion, ok := firstArchVersions[arch.ArchType]
if !ok {
panic(fmt.Errorf("Arch %q not found in firstArchVersions", archStr))
panic(fmt.Errorf("Arch %q not found in firstArchVersions", arch.ArchType))
}
if apiLevel == "minimum" {