From 1717b3bb7a49c52b26c90469f331b55f7b681690 Mon Sep 17 00:00:00 2001
From: Sam Delmerico <delmerico@google.com>
Date: Tue, 18 Jul 2023 15:07:24 -0400
Subject: [PATCH] make android.InList generic

Change-Id: Ic166216cb473371a5e34cd97a068ca35f5534740
---
 android/util.go        | 10 ++++------
 cc/config/toolchain.go |  2 --
 cc/util.go             |  4 ++--
 java/java.go           |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/android/util.go b/android/util.go
index 50bf5aa54..50b8ca831 100644
--- a/android/util.go
+++ b/android/util.go
@@ -137,19 +137,17 @@ func SortedUniqueStringValues(m interface{}) []string {
 }
 
 // IndexList returns the index of the first occurrence of the given string in the list or -1
-func IndexList(s string, list []string) int {
+func IndexList[T comparable](t T, list []T) int {
 	for i, l := range list {
-		if l == s {
+		if l == t {
 			return i
 		}
 	}
-
 	return -1
 }
 
-// InList checks if the string belongs to the list
-func InList(s string, list []string) bool {
-	return IndexList(s, list) != -1
+func InList[T comparable](t T, list []T) bool {
+	return IndexList(t, list) != -1
 }
 
 func setFromList[T comparable](l []T) map[T]bool {
diff --git a/cc/config/toolchain.go b/cc/config/toolchain.go
index a0ef57595..62f75d1bd 100644
--- a/cc/config/toolchain.go
+++ b/cc/config/toolchain.go
@@ -261,5 +261,3 @@ func LibFuzzerRuntimeLibrary(t Toolchain) string {
 func LibFuzzerRuntimeInterceptors(t Toolchain) string {
 	return LibclangRuntimeLibrary(t, "fuzzer_interceptors")
 }
-
-var inList = android.InList
diff --git a/cc/util.go b/cc/util.go
index 6d8ac435f..c93646b98 100644
--- a/cc/util.go
+++ b/cc/util.go
@@ -28,8 +28,8 @@ func includeDirsToFlags(dirs android.Paths) string {
 	return android.JoinWithPrefix(dirs.Strings(), "-I")
 }
 
-var indexList = android.IndexList
-var inList = android.InList
+var indexList = android.IndexList[string]
+var inList = android.InList[string]
 var filterList = android.FilterList
 var removeListFromList = android.RemoveListFromList
 var removeFromList = android.RemoveFromList
diff --git a/java/java.go b/java/java.go
index caafaa2e1..62731d43c 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2664,7 +2664,7 @@ func (ks *kytheExtractJavaSingleton) GenerateBuildActions(ctx android.SingletonC
 var Bool = proptools.Bool
 var BoolDefault = proptools.BoolDefault
 var String = proptools.String
-var inList = android.InList
+var inList = android.InList[string]
 
 // Add class loader context (CLC) of a given dependency to the current CLC.
 func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,