Merge "Use android.InList for inList" am: e35ad13004

am: 20b350b433

Change-Id: I4905c013fa6109a0be9c52e7f1e1042c864d0970

cc/config/toolchain.go

@@ -199,20 +199,6 @@ func addPrefix(list []string, prefix string) []string {
 	return list
 }
 
-func indexList(s string, list []string) int {
-	for i, l := range list {
-		if l == s {
-			return i
-		}
-	}
-
-	return -1
-}
-
-func inList(s string, list []string) bool {
-	return indexList(s, list) != -1
-}
-
 func SanitizerRuntimeLibrary(t Toolchain, sanitizer string) string {
 	arch := t.SanitizerRuntimeLibraryArch()
 	if arch == "" {
@@ -243,3 +229,5 @@ func ToolPath(t Toolchain) string {
 	}
 	return filepath.Join(t.GccRoot(), t.GccTriple(), "bin")
 }
+
+var inList = android.InList

java/java.go

@@ -1252,15 +1252,6 @@ func ImportFactoryHost() android.Module {
 	return module
 }
 
-func inList(s string, l []string) bool {
-	for _, e := range l {
-		if e == s {
-			return true
-		}
-	}
-	return false
-}
-
 //
 // Defaults
 //
@@ -1295,3 +1286,4 @@ func DefaultsFactory(props ...interface{}) android.Module {
 
 var Bool = proptools.Bool
 var String = proptools.String
+var inList = android.InList