From bdd344b91a5990d797eef508821a877febd0d7a0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 14 Jan 2025 16:01:03 -0800 Subject: Add extra dependency from apex to bootclasspath fragments to modules An extra dependency from apex modules to their bootclasspath fragments and from bootclasspath fragments to their contents is necessary, as the existing one with bcpfTag return false from ReplaceSourceWithPrebuilt to never rewrite the dependency to the prebuilt fragment, and we'll need a dependency to the prebuilt fragment in the next CL. Bug: 372543712 Test: all soong tests pass Change-Id: I87ff3afa0d5c90936664dd493654f1d64230b8a9 --- java/testing.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'java/testing.go') 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) { -- cgit v1.2.3-59-g8ed1b