summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2020-07-08 18:33:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-08 18:33:54 +0000
commit3b984b7d2345ad19335d0b0598514de87db38b2e (patch)
treea2cfad5f68b51ac5659447b811d71c7c72a32ab6 /java/java_test.go
parentbf5b93943761ce79d3cdca9356ede82cc03973c4 (diff)
parentad18b5c676e08762d7332a006f006d955e8c7c31 (diff)
Stop java_sdk_library_import from depending on source modules am: 44f1d8404b am: ad18b5c676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1351595 Change-Id: I98193c398be14e639aae36983ce3cb30c81a7b6e
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`,
})
}