Move string list utility functions to android package

Test: m checkbuild
Change-Id: I50a7ccf9fd7ed82b688e3eb90489c0bc0af33287
This commit is contained in:
Colin Cross
2017-12-22 15:47:09 -08:00
parent ba5b43ee44
commit b4330e222b
4 changed files with 49 additions and 57 deletions

View File

@@ -119,12 +119,12 @@ func RegisterArchFeatures(arch ArchType, features ...string) {
func RegisterArchVariantFeatures(arch ArchType, variant string, features ...string) {
checkCalledFromInit()
if variant != "" && !inList(variant, archVariants[arch]) {
if variant != "" && !InList(variant, archVariants[arch]) {
panic(fmt.Errorf("Invalid variant %q for arch %q", variant, arch))
}
for _, feature := range features {
if !inList(feature, archFeatures[arch]) {
if !InList(feature, archFeatures[arch]) {
panic(fmt.Errorf("Invalid feature %q for arch %q variant %q", feature, arch, variant))
}
}
@@ -481,13 +481,13 @@ func createArchType(props reflect.Type) reflect.Type {
if os.Linux() {
target := "Linux_" + archType.Name
if !inList(target, targets) {
if !InList(target, targets) {
targets = append(targets, target)
}
}
if os.Bionic() {
target := "Bionic_" + archType.Name
if !inList(target, targets) {
if !InList(target, targets) {
targets = append(targets, target)
}
}