summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2020-07-08 18:22:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-08 18:22:28 +0000
commitad18b5c676e08762d7332a006f006d955e8c7c31 (patch)
treec86a1b1e463f04ce0ef5923ab6b9dbb21882fdfa /java/java_test.go
parentaf6aa6ae9f678b22fc3e84f67bf7c86edef7903e (diff)
parent44f1d8404be0159ea95f74b0645157e74fe1b86e (diff)
Stop java_sdk_library_import from depending on source modules am: 44f1d8404b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351595 Change-Id: I7005815459924ddae58968e631a5809795382c9f
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go
index def42dbb8..23dcd53ab 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -86,6 +86,7 @@ func testContext() *android.TestContext {
RegisterStubsBuildComponents(ctx)
RegisterSdkLibraryBuildComponents(ctx)
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
+ ctx.PreArchMutators(android.RegisterComponentsMutator)
RegisterPrebuiltApisBuildComponents(ctx)
@@ -684,11 +685,11 @@ func TestJavaSdkLibraryImport_WithSource(t *testing.T) {
})
checkModuleDependencies(t, ctx, "prebuilt_sdklib", "android_common", []string{
+ `prebuilt_sdklib.stubs`,
`sdklib.impl`,
// This should be prebuilt_sdklib.stubs but is set to sdklib.stubs because the
// dependency is added after prebuilts may have been renamed and so has to use
// the renamed name.
- `sdklib.stubs`,
`sdklib.xml`,
})
}