diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index def42dbb8..59a2ce7aa 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`, }) } @@ -717,9 +718,8 @@ func TestJavaSdkLibraryImport_Preferred(t *testing.T) { checkModuleDependencies(t, ctx, "sdklib", "android_common", []string{ `dex2oatd`, `prebuilt_sdklib`, - // This should be sdklib.stubs but is switched to the prebuilt because it is preferred. - `prebuilt_sdklib.stubs`, `sdklib.impl`, + `sdklib.stubs`, `sdklib.stubs.source`, `sdklib.xml`, }) |