diff options
| author | 2025-01-14 16:01:03 -0800 | |
|---|---|---|
| committer | 2025-02-07 16:00:56 -0800 | |
| commit | bdd344b91a5990d797eef508821a877febd0d7a0 (patch) | |
| tree | cbc635952906b3c6834c098c9c4a50c4276b2ad8 /java/testing.go | |
| parent | d8d8b85c5666b3ded986f1b5c64df31dea5076ee (diff) | |
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
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 6 |
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) { |