summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-11 11:26:54 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-11 11:26:54 -0800
commit49740c91763ee0ee009580a0027756dee34d2ff6 (patch)
tree9bed920d5f2912e081209a368a8f720e005b0b22 /java/testing.go
parenta48d8684b253d2fcf5ca6430dae583f2260a5a92 (diff)
parentbdd344b91a5990d797eef508821a877febd0d7a0 (diff)
Add extra dependency from apex to bootclasspath fragments to modules am: bdd344b91a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3452159 Change-Id: I57bec1f0ef798d2a2e11c66571e3064167156830 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 378e2dd4f..5ee659c81 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -18,7 +18,6 @@ import (
"fmt"
"reflect"
"regexp"
- "sort"
"strings"
"testing"
@@ -611,14 +610,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) {