summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-11 11:40:02 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-11 11:40:02 -0800
commit890482e0b0cff43897d4e3e3a9ca332b3ab65996 (patch)
tree6eb58a5e735884c5fff5d7a8faafac953b22b00f /java/testing.go
parent9331868608eac651c75fb12dbf07629e69594c51 (diff)
parent49740c91763ee0ee009580a0027756dee34d2ff6 (diff)
Add extra dependency from apex to bootclasspath fragments to modules am: bdd344b91a am: 49740c9176
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3452159 Change-Id: I890e59fa7ecbef6522d380dd3486ba9a84b52c7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/testing.go b/java/testing.go
index f1d63cce8..7f1698646 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -18,7 +18,6 @@ import (
"fmt"
"reflect"
"regexp"
- "sort"
"strings"
"testing"
@@ -610,14 +609,13 @@ func getModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant
ctx.VisitDirectDeps(module, func(m blueprint.Module) {
deps = append(deps, m.Name())
})
- sort.Strings(deps)
-
- return deps
+ return android.SortedUniqueStrings(deps)
}
// CheckModuleDependencies checks if the expected dependencies of the module are
// identical to the actual dependencies.
func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) {
+ t.Helper()
deps := getModuleDependencies(t, ctx, name, variant)
if actual := deps; !reflect.DeepEqual(expected, actual) {