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

Merge "make android.InList generic" into main am: cfcd0a4960 am: 351e7c83b8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: I3e35aeba5e73185458ec5ee3923773001935ca3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Delmerico
2023-07-19 15:31:38 +00:00
committed by Automerger Merge Worker
parent 7f0e5b4cc5 351e7c83b8
commit a37e415460
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/util.go
View File

@@ -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 {

2
cc/config/toolchain.go
View File

@@ -261,5 +261,3 @@ func LibFuzzerRuntimeLibrary(t Toolchain) string {
func LibFuzzerRuntimeInterceptors(t Toolchain) string {
return LibclangRuntimeLibrary(t, "fuzzer_interceptors")
}
var inList = android.InList

4
cc/util.go
View File

@@ -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

2
java/java.go
View File

@@ -2657,7 +2657,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,