From cee7e66b07cdea5d37fbdd94bb1a34cc8caa448f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 9 Jul 2020 17:32:57 +0100 Subject: Ensure that sdk/module_exports depends on source members Previously, preferring a prebuilt of an sdk/module_exports's member would cause the sdk/module_exports to depend on the prebuilt instead of the source and cause problems with the build. This chance prevents the dependency from an sdk/module_exports to its members from being replaced with prebuilts. Bug: 160785918 Test: m nothing Change-Id: Iee4bcd438c11929e30fb5766701b05a0e89956d9 --- java/testing.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'java/testing.go') diff --git a/java/testing.go b/java/testing.go index f5688e627..94f054e67 100644 --- a/java/testing.go +++ b/java/testing.go @@ -16,9 +16,13 @@ package java import ( "fmt" + "reflect" + "sort" + "testing" "android/soong/android" "android/soong/cc" + "github.com/google/blueprint" ) func TestConfig(buildDir string, env map[string]string, bp string, fs map[string][]byte) android.Config { @@ -216,3 +220,17 @@ func GatherRequiredDepsForTest() string { return bp } + +func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) { + t.Helper() + module := ctx.ModuleForTests(name, variant).Module() + deps := []string{} + ctx.VisitDirectDeps(module, func(m blueprint.Module) { + deps = append(deps, m.Name()) + }) + sort.Strings(deps) + + if actual := deps; !reflect.DeepEqual(expected, actual) { + t.Errorf("expected %#q, found %#q", expected, actual) + } +} -- cgit v1.2.3-59-g8ed1b