RemoveFromList() should remove all matches
RemoveFromList() should remove all matches. Before this commit,
RemoveFromList() only removes the first match. This commit rewrites
RemoveFromList() so that it will remove all matches. Besides, a unit
test is written.
Note: aosp/461936 wants to make sure libc.so precedes libdl.so in
DT_NEEDED entries. However, if there are two "libdl" in shared_libs,
aosp/461936 won't achieve its goal because RemoveFromList() (prior to
this commit) only removes the first "libdl".
Bug: 62815515
Test: Build sailfish and check libstagefright.so
Change-Id: I9bec563cbf800bff4bd508fb21e28869a92cfe56
diff --git a/android/util.go b/android/util.go
index 854d782..e9b9764 100644
--- a/android/util.go
+++ b/android/util.go
@@ -101,11 +101,18 @@
func RemoveFromList(s string, list []string) (bool, []string) {
i := IndexList(s, list)
- if i != -1 {
- return true, append(list[:i], list[i+1:]...)
- } else {
+ if i == -1 {
return false, list
}
+
+ result := make([]string, 0, len(list)-1)
+ result = append(result, list[:i]...)
+ for _, l := range list[i+1:] {
+ if l != s {
+ result = append(result, l)
+ }
+ }
+ return true, result
}
// FirstUniqueStrings returns all unique elements of a slice of strings, keeping the first copy of